summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2008-10-26 16:16:44 +0000
committerRoger Leigh <rleigh@debian.org>2008-10-26 16:16:44 +0000
commit92b02ddce00dec2787514568fa9d644d4f0350e9 (patch)
tree015c66d9d7d4298a26554d12bb84c83d5c477f0e
parent3950c83c2919fe59dbf442c0d4859778fadd0e8d (diff)
Imported Upstream version 5.0.0
-rw-r--r--ChangeLog508
-rw-r--r--Makefile.in2
-rw-r--r--NEWS2171
-rw-r--r--README1120
-rwxr-xr-xconfigure261
-rw-r--r--configure.ac92
-rw-r--r--doc/Makefile.am18
-rw-r--r--doc/Makefile.in28
-rw-r--r--doc/developer/Makefile.am4
-rw-r--r--doc/developer/Makefile.in4
-rw-r--r--doc/developer/gutenprint.pdfbin548792 -> 548791 bytes
-rw-r--r--doc/developer/gutenprint.xml2
-rw-r--r--doc/gutenprint-users-manual.odtbin0 -> 295871 bytes
-rw-r--r--doc/gutenprint-users-manual.pdfbin0 -> 772146 bytes
-rw-r--r--doc/gutenprint/html/annotated.html2
-rw-r--r--doc/gutenprint/html/array_8h.html2
-rw-r--r--doc/gutenprint/html/bit-ops_8h.html2
-rw-r--r--doc/gutenprint/html/channel_8h.html2
-rw-r--r--doc/gutenprint/html/classes.html2
-rw-r--r--doc/gutenprint/html/color_8h.html2
-rw-r--r--doc/gutenprint/html/curve-cache_8h.html2
-rw-r--r--doc/gutenprint/html/curve_8h.html2
-rw-r--r--doc/gutenprint/html/deprecated.html2
-rw-r--r--doc/gutenprint/html/dir_000000.html2
-rw-r--r--doc/gutenprint/html/dir_000001.html2
-rw-r--r--doc/gutenprint/html/dirs.html2
-rw-r--r--doc/gutenprint/html/dither_8h.html2
-rw-r--r--doc/gutenprint/html/files.html2
-rw-r--r--doc/gutenprint/html/functions.html2
-rw-r--r--doc/gutenprint/html/functions_vars.html2
-rw-r--r--doc/gutenprint/html/globals.html2
-rw-r--r--doc/gutenprint/html/globals_0x62.html2
-rw-r--r--doc/gutenprint/html/globals_0x63.html2
-rw-r--r--doc/gutenprint/html/globals_0x64.html2
-rw-r--r--doc/gutenprint/html/globals_0x67.html2
-rw-r--r--doc/gutenprint/html/globals_0x6e.html2
-rw-r--r--doc/gutenprint/html/globals_0x70.html2
-rw-r--r--doc/gutenprint/html/globals_0x73.html2
-rw-r--r--doc/gutenprint/html/globals_0x74.html2
-rw-r--r--doc/gutenprint/html/globals_defs.html2
-rw-r--r--doc/gutenprint/html/globals_enum.html2
-rw-r--r--doc/gutenprint/html/globals_eval.html2
-rw-r--r--doc/gutenprint/html/globals_func.html2
-rw-r--r--doc/gutenprint/html/globals_type.html2
-rw-r--r--doc/gutenprint/html/globals_vars.html2
-rw-r--r--doc/gutenprint/html/group__array.html2
-rw-r--r--doc/gutenprint/html/group__color.html2
-rw-r--r--doc/gutenprint/html/group__curve.html2
-rw-r--r--doc/gutenprint/html/group__image.html2
-rw-r--r--doc/gutenprint/html/group__intl.html2
-rw-r--r--doc/gutenprint/html/group__intl__internal.html2
-rw-r--r--doc/gutenprint/html/group__list.html2
-rw-r--r--doc/gutenprint/html/group__papersize.html2
-rw-r--r--doc/gutenprint/html/group__printer.html2
-rw-r--r--doc/gutenprint/html/group__sequence.html2
-rw-r--r--doc/gutenprint/html/group__util.html2
-rw-r--r--doc/gutenprint/html/group__vars.html2
-rw-r--r--doc/gutenprint/html/group__version.html2
-rw-r--r--doc/gutenprint/html/gutenprint-intl-internal_8h.html2
-rw-r--r--doc/gutenprint/html/gutenprint-intl_8h.html2
-rw-r--r--doc/gutenprint/html/gutenprint-module_8h.html2
-rw-r--r--doc/gutenprint/html/gutenprint-version_8h.html2
-rw-r--r--doc/gutenprint/html/gutenprint_8h.html2
-rw-r--r--doc/gutenprint/html/image_8h.html2
-rw-r--r--doc/gutenprint/html/index.html2
-rw-r--r--doc/gutenprint/html/list_8h.html2
-rw-r--r--doc/gutenprint/html/module_8h.html2
-rw-r--r--doc/gutenprint/html/modules.html2
-rw-r--r--doc/gutenprint/html/mxml_8h.html2
-rw-r--r--doc/gutenprint/html/pages.html2
-rw-r--r--doc/gutenprint/html/paper_8h.html2
-rw-r--r--doc/gutenprint/html/path_8h.html2
-rw-r--r--doc/gutenprint/html/printers_8h.html2
-rw-r--r--doc/gutenprint/html/sequence_8h.html2
-rw-r--r--doc/gutenprint/html/string-list_8h.html2
-rw-r--r--doc/gutenprint/html/structdither__matrix__impl.html2
-rw-r--r--doc/gutenprint/html/structstp__cached__curve__t.html2
-rw-r--r--doc/gutenprint/html/structstp__color.html2
-rw-r--r--doc/gutenprint/html/structstp__colorfuncs__t.html2
-rw-r--r--doc/gutenprint/html/structstp__curve__point__t.html2
-rw-r--r--doc/gutenprint/html/structstp__dither__matrix__generic.html2
-rw-r--r--doc/gutenprint/html/structstp__dither__matrix__normal.html2
-rw-r--r--doc/gutenprint/html/structstp__dither__matrix__short.html2
-rw-r--r--doc/gutenprint/html/structstp__dotsize.html2
-rw-r--r--doc/gutenprint/html/structstp__double__bound__t.html2
-rw-r--r--doc/gutenprint/html/structstp__family.html2
-rw-r--r--doc/gutenprint/html/structstp__image.html2
-rw-r--r--doc/gutenprint/html/structstp__int__bound__t.html2
-rw-r--r--doc/gutenprint/html/structstp__lineactive__t.html2
-rw-r--r--doc/gutenprint/html/structstp__linebounds__t.html2
-rw-r--r--doc/gutenprint/html/structstp__linebufs__t.html2
-rw-r--r--doc/gutenprint/html/structstp__linecount__t.html2
-rw-r--r--doc/gutenprint/html/structstp__lineoff__t.html2
-rw-r--r--doc/gutenprint/html/structstp__module.html2
-rw-r--r--doc/gutenprint/html/structstp__module__version.html2
-rw-r--r--doc/gutenprint/html/structstp__mxml__attr__s.html2
-rw-r--r--doc/gutenprint/html/structstp__mxml__node__s.html2
-rw-r--r--doc/gutenprint/html/structstp__mxml__text__s.html2
-rw-r--r--doc/gutenprint/html/structstp__mxml__value__s.html2
-rw-r--r--doc/gutenprint/html/structstp__papersize__t.html2
-rw-r--r--doc/gutenprint/html/structstp__param__string__t.html2
-rw-r--r--doc/gutenprint/html/structstp__parameter__t.html2
-rw-r--r--doc/gutenprint/html/structstp__pass__t.html2
-rw-r--r--doc/gutenprint/html/structstp__printfuncs__t.html2
-rw-r--r--doc/gutenprint/html/structstp__raw__t.html2
-rw-r--r--doc/gutenprint/html/structstp__shade.html2
-rw-r--r--doc/gutenprint/html/structstp__weave__t.html2
-rw-r--r--doc/gutenprint/html/unionstp__mxml__value__u.html2
-rw-r--r--doc/gutenprint/html/util_8h.html2
-rw-r--r--doc/gutenprint/html/vars_8h.html2
-rw-r--r--doc/gutenprint/html/weave_8h.html2
-rw-r--r--doc/gutenprint/html/xml_8h.html2
-rw-r--r--doc/gutenprintui2/html/annotated.html2
-rw-r--r--doc/gutenprintui2/html/classes.html2
-rw-r--r--doc/gutenprintui2/html/curve_8h.html2
-rw-r--r--doc/gutenprintui2/html/dir_000000.html2
-rw-r--r--doc/gutenprintui2/html/dir_000001.html2
-rw-r--r--doc/gutenprintui2/html/dirs.html2
-rw-r--r--doc/gutenprintui2/html/files.html2
-rw-r--r--doc/gutenprintui2/html/functions.html2
-rw-r--r--doc/gutenprintui2/html/functions_vars.html2
-rw-r--r--doc/gutenprintui2/html/gammacurve_8h.html2
-rw-r--r--doc/gutenprintui2/html/globals.html2
-rw-r--r--doc/gutenprintui2/html/globals_defs.html2
-rw-r--r--doc/gutenprintui2/html/globals_enum.html2
-rw-r--r--doc/gutenprintui2/html/globals_eval.html2
-rw-r--r--doc/gutenprintui2/html/globals_func.html2
-rw-r--r--doc/gutenprintui2/html/globals_type.html2
-rw-r--r--doc/gutenprintui2/html/gutenprintui_8h.html2
-rw-r--r--doc/gutenprintui2/html/index.html2
-rw-r--r--doc/gutenprintui2/html/struct__StpuiCurve.html2
-rw-r--r--doc/gutenprintui2/html/struct__StpuiCurveClass.html2
-rw-r--r--doc/gutenprintui2/html/struct__StpuiGammaCurve.html2
-rw-r--r--doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html2
-rw-r--r--doc/gutenprintui2/html/structstpui__image.html2
-rw-r--r--doc/gutenprintui2/html/structstpui__plist__t.html2
-rw-r--r--doc/gutenprintui2/html/typebuiltins_8h.html2
-rw-r--r--doc/users_guide/Makefile.am543
-rw-r--r--doc/users_guide/Makefile.in980
-rw-r--r--doc/users_guide/README39
-rw-r--r--doc/users_guide/cups-edition.sgml58
-rw-r--r--doc/users_guide/cups.sgml320
-rw-r--r--doc/users_guide/figures/cups_admin.pngbin11105 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_admin_device.pngbin10515 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_admin_make.pngbin11540 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_admin_model.pngbin12445 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_admin_success.pngbin10441 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_config_printer.pngbin15395 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_my_printer.pngbin14544 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_printers.pngbin10008 -> 0 bytes
-rw-r--r--doc/users_guide/figures/cups_startup.pngbin11252 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp-print-gui-1.pngbin24241 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp-print-gui.pngbin26080 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp-print-new-printer.pngbin1438 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp-print-print-color-adjust.pngbin11402 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp-print-setup.pngbin2973 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp_image.pngbin35648 -> 0 bytes
-rw-r--r--doc/users_guide/figures/gimp_startup.pngbin3890 -> 0 bytes
-rw-r--r--doc/users_guide/gfdl.sgml466
-rw-r--r--doc/users_guide/gimp-edition.sgml58
-rw-r--r--doc/users_guide/gimp.sgml886
-rw-r--r--doc/users_guide/history.sgml108
-rw-r--r--doc/users_guide/html-stamp0
-rw-r--r--doc/users_guide/html/book1.html487
-rw-r--r--doc/users_guide/html/c29.html260
-rw-r--r--doc/users_guide/html/c443.html206
-rw-r--r--doc/users_guide/html/c568.html754
-rw-r--r--doc/users_guide/html/ch-gimp-and-gimp-print.html245
-rw-r--r--doc/users_guide/html/docbook.css12
-rw-r--r--doc/users_guide/html/gfdl.html247
-rw-r--r--doc/users_guide/html/ln12.html93
-rw-r--r--doc/users_guide/html/stylesheet-images/caution.gifbin1039 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/home.gifbin995 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/important.gifbin1081 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/next.gifbin964 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/note.gifbin1070 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/prev.gifbin944 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/tip.gifbin1029 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/toc-blank.gifbin95 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/toc-minus.gifbin843 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/toc-plus.gifbin846 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/up.gifbin922 -> 0 bytes
-rw-r--r--doc/users_guide/html/stylesheet-images/warning.gifbin1052 -> 0 bytes
-rw-r--r--doc/users_guide/html/x452.html456
-rw-r--r--doc/users_guide/html/x544.html193
-rw-r--r--doc/users_guide/html/x559.html233
-rw-r--r--doc/users_guide/html/x640.html205
-rw-r--r--doc/users_guide/html/x650.html155
-rw-r--r--doc/users_guide/html/x654.html179
-rw-r--r--doc/users_guide/html/x660.html285
-rw-r--r--doc/users_guide/html/x696.html164
-rw-r--r--doc/users_guide/html/x701.html154
-rw-r--r--doc/users_guide/html/x705.html158
-rw-r--r--doc/users_guide/html/x709.html153
-rw-r--r--doc/users_guide/html/x712.html150
-rw-r--r--doc/users_guide/html/x715.html161
-rw-r--r--doc/users_guide/html/x720.html160
-rw-r--r--doc/users_guide/html/x85.html1762
-rw-r--r--doc/users_guide/title.sgml64
-rw-r--r--doc/users_guide/users-guide.pdfbin576642 -> 0 bytes
-rw-r--r--doc/users_guide/users-guide.sgml37
-rw-r--r--doc/users_guide/util-edition.sgml57
-rw-r--r--doc/users_guide/utils.sgml421
-rw-r--r--include/Makefile.in2
-rw-r--r--include/gutenprint/Makefile.in2
-rw-r--r--include/gutenprint/string-list.h4
-rw-r--r--include/gutenprintui/Makefile.in2
-rw-r--r--include/gutenprintui2/Makefile.in2
-rw-r--r--m4/stp_release.m42
-rw-r--r--m4extra/pkg.m4156
-rw-r--r--man/Makefile.in2
-rw-r--r--man/ijsgutenprint.1.in225
-rw-r--r--po/cs.gmobin32892 -> 32892 bytes
-rw-r--r--po/cs.po805
-rw-r--r--po/da.gmobin121458 -> 122264 bytes
-rw-r--r--po/da.po899
-rw-r--r--po/de.gmobin31265 -> 31265 bytes
-rw-r--r--po/de.po808
-rw-r--r--po/el.gmobin4362 -> 4362 bytes
-rw-r--r--po/el.po802
-rw-r--r--po/en_GB.gmobin55609 -> 120998 bytes
-rw-r--r--po/en_GB.po3456
-rw-r--r--po/es.gmobin30816 -> 30816 bytes
-rw-r--r--po/es.po806
-rw-r--r--po/fr.gmobin58212 -> 124079 bytes
-rw-r--r--po/fr.po4520
-rw-r--r--po/gutenprint.pot797
-rw-r--r--po/hu.gmobin61547 -> 107359 bytes
-rw-r--r--po/hu.po2923
-rw-r--r--po/ja.gmobin30784 -> 30784 bytes
-rw-r--r--po/ja.po805
-rw-r--r--po/nb.gmobin14021 -> 14021 bytes
-rw-r--r--po/nb.po805
-rw-r--r--po/nl.gmobin25289 -> 25289 bytes
-rw-r--r--po/nl.po802
-rw-r--r--po/pl.gmobin7345 -> 7345 bytes
-rw-r--r--po/pl.po802
-rw-r--r--po/pt.gmobin32928 -> 32928 bytes
-rw-r--r--po/pt.po805
-rw-r--r--po/sk.gmobin31262 -> 31262 bytes
-rw-r--r--po/sk.po805
-rw-r--r--po/sv.gmobin31759 -> 112028 bytes
-rw-r--r--po/sv.po4432
-rw-r--r--po/zh_TW.gmobin30771 -> 30768 bytes
-rw-r--r--po/zh_TW.po804
-rw-r--r--samples/Makefile.in2
-rw-r--r--scripts/Makefile.in2
-rw-r--r--src/Makefile.in2
-rw-r--r--src/cups/Makefile.in2
-rw-r--r--src/cups/cups-genppdconfig.in171
-rw-r--r--src/cups/cups-genppdupdate.in16
-rw-r--r--src/cups/genppd.c32
-rw-r--r--src/cups/rastertoprinter.c36
-rw-r--r--src/escputil/Makefile.in2
-rw-r--r--src/escputil/escputil.c86
-rw-r--r--src/foomatic/Makefile.am10
-rw-r--r--src/foomatic/Makefile.in8
-rw-r--r--src/foomatic/foomatic-generator.in26
-rw-r--r--src/foomatic/printer_options.c20
-rw-r--r--src/ghost/Makefile.in2
-rw-r--r--src/ghost/ijsgutenprint.c52
-rw-r--r--src/gimp/Makefile.in2
-rw-r--r--src/gimp2/Makefile.am17
-rw-r--r--src/gimp2/Makefile.in28
-rw-r--r--src/gimp2/print-gutenprint.c62
-rw-r--r--src/gimp2/print-print.c52
-rw-r--r--src/gimp2/print.c30
-rw-r--r--src/gimp2/print_gimp.h15
-rw-r--r--src/gutenprintui/Makefile.in2
-rw-r--r--src/gutenprintui/panel.c150
-rw-r--r--src/gutenprintui/plist.c6
-rw-r--r--src/gutenprintui/ui-utils.c10
-rw-r--r--src/gutenprintui2/Makefile.in2
-rw-r--r--src/gutenprintui2/panel.c24
-rw-r--r--src/gutenprintui2/ui-utils.c10
-rw-r--r--src/main/Makefile.in2
-rw-r--r--src/main/dither-main.c13
-rw-r--r--src/main/escp2-channels.c6
-rw-r--r--src/main/escp2-driver.c31
-rw-r--r--src/main/escp2-papers.c84
-rw-r--r--src/main/generic-options.c8
-rw-r--r--src/main/path.c6
-rw-r--r--src/main/print-canon.c14
-rw-r--r--src/main/print-color.c10
-rw-r--r--src/main/print-escp2-data.c319
-rw-r--r--src/main/print-escp2.c202
-rw-r--r--src/main/print-escp2.h11
-rw-r--r--src/main/print-lexmark.c12
-rw-r--r--src/main/print-list.c4
-rw-r--r--src/main/print-olympus.c10
-rw-r--r--src/main/print-pcl.c52
-rw-r--r--src/main/print-ps.c58
-rw-r--r--src/main/print-vars.c12
-rw-r--r--src/main/print-weave.c27
-rw-r--r--src/main/printers.xml102
-rw-r--r--src/main/sequence.c4
-rw-r--r--src/testpattern/Makefile.am3
-rw-r--r--src/testpattern/Makefile.in7
-rw-r--r--src/testpattern/printer_options.c20
-rw-r--r--test/Makefile.in2
300 files changed, 14511 insertions, 29025 deletions
diff --git a/ChangeLog b/ChangeLog
index 97fd1a7..0451aa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,511 @@
+2006-07-22 <rlk@sourceforge.net>
+
+ Files: NEWS (1.305) (+3 -0)
+ src/main/escp2-driver.c (1.30) (+4 -2)
+ src/main/print-escp2-data.c (1.202) (+79 -79)
+ src/main/print-escp2.c (1.354) (+11 -1)
+ src/main/print-escp2.h (1.105) (+5 -2)
+
+ Fix bottom margin for Epson R800 and R1800.
+
+2006-07-22 <rlk@sourceforge.net>
+
+ Files: README (1.165) (+1 -2)
+
+ Minor update to README.
+
+2006-07-20 <rlk@sourceforge.net>
+
+ Files: po/da.po (1.72) (+5 -9)
+
+ Another da.po update
+
+2006-07-20 <rlk@sourceforge.net>
+
+ Files: po/da.po (1.71) (+16 -12)
+
+ Updated Danish translation
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: src/gutenprintui/plist.c (1.3) (+3 -3)
+
+ Fix problem with g_strconcat and remove one last Gimp-Print nit.
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: doc/Makefile.am (1.48) (+2 -2)
+
+ Make install-data-local depend on the installed documentation.
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: configure.ac (1.145) (+2 -3)
+
+ Don't print out install user's manual in config summary
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: configure.ac (1.144) (+7 -12)
+ doc/developer/Makefile.am (1.19) (+1 -3)
+
+ Remove configure option for user guide
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: NEWS (1.304) (+17 -1973)
+ README (1.164) (+12 -306)
+ configure.ac (1.143) (+2 -3)
+ doc/Makefile.am (1.47) (+10 -11)
+ doc/gutenprint-users-manual.odt (1.1) (added)
+ doc/gutenprint-users-manual.pdf (1.1) (added)
+
+ 1260142 User documentation needs updating for 5.0.0
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: NEWS (1.303) (+2 -1)
+
+ Clean up duplication.
+
+2006-07-16 <rlk@sourceforge.net>
+
+ Files: NEWS (1.302) (+19 -4)
+ src/gutenprintui/panel.c (1.9) (+69 -59)
+
+ Fix a problem with image rotation in the GIMP 1.2/Cinepaint plugin.
+
+2006-07-11 <rleigh@sourceforge.net>
+
+ Files: doc/developer/gutenprint.xml (1.2) (+1 -1)
+
+ doc/developer/gutenprint.xml: Use URI in DOCTYPE in place of absolute
+ filename. This is much more portable, and XML catalogues are now
+ supported on current systems.
+
+2006-07-08 <rlk@sourceforge.net>
+
+ Files: src/foomatic/Makefile.am (1.50) (+7 -3)
+
+ 1033007 Foomatic XML data generation is locale-dependent
+
+2006-07-07 <rleigh@sourceforge.net>
+
+ Files: include/gutenprint/string-list.h (1.3) (+4 -4)
+
+ include/gutenprint/string-list.h: The name and text members of the
+ stp_param_string_t structure should be const for use in static
+ initialisers.
+
+2006-07-07 <rleigh@sourceforge.net>
+
+ Files: src/main/print-weave.c (1.65) (+13 -14)
+
+ src/main/print-weave.c: stpi_softweave_t is not "logically const".
+
+2006-07-07 <rleigh@sourceforge.net>
+
+ Files: include/gutenprint/string-list.h (1.2) (+4 -4)
+ src/main/path.c (1.19) (+3 -3)
+ src/main/print-list.c (1.24) (+2 -2)
+ src/main/sequence.c (1.22) (+2 -2)
+
+ src/main/sequence.c: deconst_sequence is inlined.
+ src/main/print-list.c: deconst_list is inlined.
+ src/main/path.c: Fix the constness of the struct dirent pointers
+ passed to strcoll.
+ include/gutenprint/string-list.h: The name and text members of the
+ stp_param_string_t structure should not be const.
+
+2006-07-07 <rlk@sourceforge.net>
+
+ Files: NEWS (1.301) (+3 -0)
+ src/main/print-pcl.c (1.144) (+41 -1)
+ src/main/printers.xml (1.146) (+47 -47)
+
+ 1518131 Kyocera KM-2530 CUPS+Gutenprint PPD - A4 paper
+
+2006-07-06 <rlk@sourceforge.net>
+
+ Files: NEWS (1.300) (+1 -4)
+
+ Remove prerelease wording.
+
+2006-07-05 <rlk@sourceforge.net>
+
+ Files: doc/5.0-release-plan.txt (1.10) (+37 -8)
+
+ Update on what has been accomplished in 5.0.
+
+2006-07-05 <rlk@sourceforge.net>
+
+ Files: README (1.163) (+10 -3)
+
+ Clarify development libraries a bit more.
+
+2006-07-04 <rlk@sourceforge.net>
+
+ Files: NEWS (1.299) (+3 -0)
+
+ In the GIMP 2.4 and above (forthcoming as of Gutenprint 5.0 release),
+ the enhanced Print plugin will be named "Print with Gutenprint" so as
+ not to collide with the GtkPrint-based plugin bundled with that
+ version of the GIMP. The Print plugin bundled with GIMP 2.0 and 2.2
+ is based on Gimp-Print 4.2; the Print plugin in this package simply
+ replaces the Print plugin in those versions of the GIMP.
+
+2006-07-04 <rlk@sourceforge.net>
+
+ Files: po/da.po (1.70) (+249 -345)
+
+ Updated da.po
+
+2006-07-04 <rlk@sourceforge.net>
+
+ Files: NEWS (1.298) (+42 -28)
+ README (1.162) (+76 -58)
+ configure.ac (1.142) (+36 -11)
+ src/gimp2/Makefile.am (1.7) (+14 -3)
+ src/gimp2/print-gutenprint.c (1.1) (added)
+ src/gimp2/print-print.c (1.1) (added)
+ src/gimp2/print.c (1.8) (+6 -24)
+ src/gimp2/print_gimp.h (1.5) (+14 -1)
+
+ In the GIMP 2.4 and above (forthcoming as of Gutenprint 5.0 release),
+ the enhanced Print plugin will be named "Print with Gutenprint" so as
+ not to collide with the GtkPrint-based plugin bundled with that
+ version of the GIMP. The Print plugin bundled with GIMP 2.0 and 2.2
+ is based on Gimp-Print 4.2; the Print plugin in this package simply
+ replaces the Print plugin in those versions of the GIMP.
+
+2006-07-04 <rlk@sourceforge.net>
+
+ Files: src/cups/rastertoprinter.c (1.104) (+4 -4)
+ src/ghost/ijsgutenprint.c (1.18) (+3 -3)
+
+ Be a bit more defensive about printing things out.
+
+2006-07-01 <rlk@sourceforge.net>
+
+ Files: src/ghost/ijsgutenprint.c (1.17) (+2 -2)
+
+ Use safe_get_string_parameter rather than stp_get_string_parameter
+ when calling fprintf.
+
+2006-06-26 <rlk@sourceforge.net>
+
+ Files: NEWS (1.297) (+13 -9)
+
+ Add note that color laser printers are supported in grayscale only.
+
+2006-06-25 <rlk@sourceforge.net>
+
+ Files: src/cups/rastertoprinter.c (1.103) (+7 -4)
+
+ Another spot we attempted to print a null pointer.
+
+2006-06-25 <rlk@sourceforge.net>
+
+ Files: src/cups/rastertoprinter.c (1.102) (+4 -3)
+
+ Don't attempt to printf a null pointer (not all versions of libc will
+ handle this gracefully).
+
+2006-06-25 <rlk@sourceforge.net>
+
+ Files: src/main/print-vars.c (1.75) (+9 -3)
+
+ Don't attempt to copy zero bytes from a null pointer.
+
+2006-06-25 <rlk@sourceforge.net>
+
+ Files: configure.ac (1.141) (+3 -3)
+
+ Slight improvement in wording of warning message.
+
+2006-06-22 <rlk@sourceforge.net>
+
+ Files: NEWS (1.296) (+3 -2)
+ po/hu.po (1.8) (+996 -1676)
+
+ Update Hungarian translation
+
+2006-06-22 <rlk@sourceforge.net>
+
+ Files: NEWS (1.295) (+10 -5)
+ src/ghost/ijsgutenprint.c (1.16) (+25 -17)
+
+ 1501816 ijsgutenprint/foomatic only prints first page
+
+2006-06-04 <rleigh@sourceforge.net>
+
+ Files: NEWS (1.294) (+367 -8)
+
+ NEWS: Add changes between previous 5.0.0 release candidates.
+
+2006-06-04 <rleigh@sourceforge.net>
+
+ Files: src/main/print-ps.c (1.87) (+29 -25)
+
+ print-ps.c: The Postscript driver now handles PPD files with non-integer
+ imageable areas correctly in all locales (the PPD files certain HP inkjet
+ printers using the HPIJS driver have non-integer imageable areas for some
+ paper sizes). In 5.0.0-rc3, this was handled incorrectly in locales that
+ do not use the decimal point (".") for separating fractions from integers.
+
+2006-06-01 <rlk@sourceforge.net>
+
+ Files: src/main/escp2-channels.c (1.62) (+3 -3)
+ src/main/print-escp2.c (1.353) (+12 -3)
+
+ Make gray transitions work on R2400
+
+2006-05-31 <rlk@sourceforge.net>
+
+ Files: src/main/print-escp2-data.c (1.201) (+17 -17)
+
+ Use unidirectional mode by default above 1440x720 on R2400 and above
+ 1440x1440 on R800 (yields better smoothness).
+
+2006-05-31 <rlk@sourceforge.net>
+
+ Files: src/main/escp2-papers.c (1.99) (+21 -21)
+
+ Improve matte black on R2400.
+
+2006-05-31 <rlk@sourceforge.net>
+
+ Files: src/main/escp2-papers.c (1.98) (+22 -22)
+
+ Improve matte black ink on R800.
+
+2006-05-31 <rleigh@sourceforge.net>
+
+ Files: src/escputil/escputil.c (1.87) (+27 -23)
+
+ src/escputil/escputil.c: Print a proper error message when a raw device
+ was not specified when needed.
+
+2006-05-31 <rlk@sourceforge.net>
+
+ Files: src/cups/rastertoprinter.c (1.101) (+14 -6)
+
+ Fix printers without borderless capability.
+
+2006-05-30 <rleigh@sourceforge.net>
+
+ Files: src/cups/cups-genppdconfig.in (1.13) (+18 -153)
+
+ src/cups/cups-genppdconfig.in: Remove perlmenu support.
+
+2006-05-30 <rlk@sourceforge.net>
+
+ Files: src/cups/rastertoprinter.c (1.100) (+6 -6)
+
+ Use the imageable area to define the margins, not the bounding box
+ from CUPS.
+
+2006-05-30 <rlk@sourceforge.net>
+
+ Files: src/main/print-ps.c (1.86) (+3 -1)
+
+ Don't disable PPDFile parameter when the PPD file is set.
+
+2006-05-29 <rleigh@sourceforge.net>
+
+ Files: m4extra/pkg.m4 (1.1) (added)
+
+ m4extra/pkg.m4: Add pkg-config macros.
+
+2006-05-29 <rleigh@sourceforge.net>
+
+ Files: po/en_GB.po (1.143) (+997 -1691)
+
+ Update British English translation.
+
+2006-05-29 <rlk@sourceforge.net>
+
+ Files: po/cs.po (1.37) (+182 -175)
+ po/da.po (1.69) (+344 -248)
+ po/de.po (1.50) (+182 -175)
+ po/el.po (1.51) (+182 -175)
+ po/en_GB.po (1.142) (+181 -174)
+ po/es.po (1.49) (+182 -175)
+ po/fr.po (1.75) (+916 -1395)
+ po/hu.po (1.7) (+181 -174)
+ po/ja.po (1.45) (+182 -175)
+ po/nb.po (1.12) (+182 -175)
+ po/nl.po (1.51) (+182 -175)
+ po/pl.po (1.55) (+182 -175)
+ po/pt.po (1.50) (+182 -175)
+ po/sk.po (1.54) (+182 -175)
+ po/sv.po (1.82) (+361 -254)
+ po/zh_TW.po (1.11) (+181 -174)
+
+ 20060528 snapshot
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: NEWS (1.293) (+39 -351)
+ README (1.161) (+264 -83)
+ configure.ac (1.140) (+18 -14)
+
+ Start prep for 5.0.0 release
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: src/main/printers.xml (1.145) (+5 -5)
+
+ Reorder some printers.
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: doc/Makefile.am (1.46) (+6 -1)
+
+ Install the FAQ.
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: src/main/escp2-driver.c (1.29) (+23 -4)
+ src/main/print-escp2-data.c (1.200) (+82 -81)
+ src/main/print-escp2.c (1.352) (+116 -45)
+ src/main/print-escp2.h (1.104) (+6 -2)
+
+ 1) In the Epson driver, make the cutoff for deciding whether to print
+ unidirectional vs. bidirectional printer-dependent rather than
+ always 720 DPI. Many of the newer printers do just fine printing
+ bidirectionally even at very high resolutions, and some actually do
+ better in bidirectional mode.
+
+ 2) For determining which quality modes to make available, factor in
+ the extra passes as well as the horizontal and vertical
+ resolutions. This is because some of the newer printers can't
+ print at higher than 1440 DPI horizontally without slowing down by
+ about an order of magnitude, so we're offering high quality
+ (2-pass) and highest quality (4-pass) mode at 1440x2880 DPI. For
+ this purpose, 1440x2880 high quality would be treated as equivalent
+ to 2880x2880 and 1440x2880 highest quality would be treated as
+ equivalent to 5760x2880. This allows us to offer "super photo" and
+ "ultra photo" modes on the R800 and friends.
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: src/testpattern/Makefile.am (1.25) (+2 -1)
+
+ Rebuild run-testpattern-2 if it changes.
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: src/cups/genppd.c (1.118) (+15 -17)
+ src/escputil/escputil.c (1.86) (+19 -19)
+ src/foomatic/printer_options.c (1.50) (+10 -10)
+ src/ghost/ijsgutenprint.c (1.15) (+3 -3)
+ src/gutenprintui/panel.c (1.8) (+12 -12)
+ src/gutenprintui/ui-utils.c (1.2) (+5 -5)
+ src/gutenprintui2/panel.c (1.11) (+12 -12)
+ src/gutenprintui2/ui-utils.c (1.3) (+5 -5)
+ src/main/dither-main.c (1.52) (+6 -7)
+ src/main/generic-options.c (1.10) (+4 -4)
+ src/main/print-canon.c (1.174) (+7 -7)
+ src/main/print-color.c (1.135) (+5 -5)
+ src/main/print-escp2.c (1.351) (+10 -10)
+ src/main/print-lexmark.c (1.154) (+6 -6)
+ src/main/print-olympus.c (1.59) (+5 -5)
+ src/main/print-pcl.c (1.143) (+6 -6)
+ src/main/print-ps.c (1.85) (+2 -2)
+ src/testpattern/printer_options.c (1.2) (+10 -10)
+
+ Various i18n fixes.
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: po/zh_TW.po (1.10) (+2 -2)
+
+ Fix up name of language
+
+2006-05-28 <rlk@sourceforge.net>
+
+ Files: po/fr.po (1.74) (+2 -2)
+ po/zh_TW.po (1.9) (+2 -2)
+
+ Fix up name of language
+
+2006-05-27 <rlk@sourceforge.net>
+
+ Files: po/da.po (1.68) (+92 -196)
+
+ Updated Danish translation
+
+2006-05-27 <rlk@sourceforge.net>
+
+ Files: po/fr.po (1.73) (+2529 -3263)
+
+ Updated French translation from Regis.
+
+2006-05-24 <rlk@sourceforge.net>
+
+ Files: man/ijsgutenprint.1.in (1.4) (+14 -207)
+
+ Remove all Gutenprint options from the man page.
+
+2006-05-24 <rleigh@sourceforge.net>
+
+ Files: man/ijsgutenprint.1.in (1.3) (+17 -7)
+
+ ijsgutenprint.1.in: Document that ijsgutenprint must be invoked via
+ Foomatic, and that the options documented here are not complete.
+
+2006-05-24 <rlk@sourceforge.net>
+
+ Files: po/sv.po (1.81) (+1633 -2132)
+
+ Updated Swedish translation
+
+2006-05-22 <rleigh@sourceforge.net>
+
+ Files: src/cups/cups-genppdupdate.in (1.25) (+9 -7)
+
+ cups-genppdupdate.in: Make sure egrep always has input files, otherwise
+ it will freeze waiting on stdin.
+
+2006-05-22 <tillkamppeter@sourceforge.net>
+
+ Files: src/foomatic/foomatic-generator.in (1.60) (+21 -5)
+
+ Assigned order parameter to the options in the Foomatic data. This way
+ the options can be presented in a more user-friendly order, especially
+ inside each group non-numerical options come first, then each
+ numerical option preceeded by its "Enable" option (foomatic-db-engine
+ CVS of May 22 2006 needed that order parameter is taken into account
+ in PPD build).
+
+2006-05-21 <rlk@sourceforge.net>
+
+ Files: README (1.160) (+721 -450)
+
+ First draft of Gutenprint 5.0 README.
+
+2006-05-18 <rlk@sourceforge.net>
+
+ Files: po/cs.po (1.36) (+42 -27)
+ po/da.po (1.67) (+42 -27)
+ po/de.po (1.49) (+42 -27)
+ po/el.po (1.50) (+42 -27)
+ po/en_GB.po (1.141) (+42 -27)
+ po/es.po (1.48) (+42 -27)
+ po/fr.po (1.72) (+42 -27)
+ po/hu.po (1.6) (+42 -27)
+ po/ja.po (1.44) (+42 -27)
+ po/nb.po (1.11) (+42 -27)
+ po/nl.po (1.50) (+42 -27)
+ po/pl.po (1.54) (+42 -27)
+ po/pt.po (1.49) (+42 -27)
+ po/sk.po (1.53) (+42 -27)
+ po/sv.po (1.80) (+43 -28)
+ po/zh_TW.po (1.8) (+42 -27)
+
+ Gutenprint 5.0.0-rc3 release
+
2006-05-15 <rlk@sourceforge.net>
Files: po/fr.po (1.71) (+17 -17)
diff --git a/Makefile.in b/Makefile.in
index 4871fbe..8ef3d29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,6 +107,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/NEWS b/NEWS
index 6a4d100..e4b7132 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Welcome to Gutenprint 5.0.0-rc3! Please read these release notes
+Welcome to Gutenprint 5.0.0! Please read these release notes
carefully.
Gutenprint, formerly named Gimp-Print, is a suite of printer drivers
@@ -8,25 +8,25 @@ quality printing for UNIX (including Macintosh OS X 10.2, 10.3, and
10.4) and Linux systems that in many cases equal or exceed proprietary
vendor-supplied drivers in quality and functionality, and can be used
for demanding printing tasks requiring flexibility and high quality.
-This software package includes the Print plug-in for the GIMP and
-Ghostscript and CUPS drivers, as well as Foomatic data.
-
-The package has been renamed in order to clearly distinguish it from
-the GIMP. While this package started out as the Print plugin for the
-GIMP, it has expanded into a collection of general purpose printer
-drivers, and the Print plugin for the GIMP is now only a small (but
-important) piece of the package. Furthermore, the name Gutenprint
-recognizes Johannes Gutenberg, the inventor of the movable type
-printing press. Finally, the word "guten" means "good" in German.
-
-Gutenprint 5.0.0-rc3 is the third release candidate of Gutenprint 5.0,
-and incorporates extensive feedback from the first release candidate.
-It is based on the Gimp-Print 4.3 series that has been in development
-for over three years, and includes many improvements over the very
-popular 4.2 series. This release is believed to be quite stable, but
-further testing is required before final release. We believe this
-release to be stable enough for day to day use, and encourage people
-to test it and report their results.
+This software package includes an enhanced Print plug-in for the GIMP
+that replaces the plug-in packaged with the GIMP, and Ghostscript and
+CUPS drivers, as well as Foomatic data supporting the Ghostscript
+driver.
+
+Gutenprint has been renamed in order to clearly distinguish it from
+the GIMP. While this package started out as the original Print plugin
+for the GIMP, it has expanded into a collection of general purpose
+printer drivers, and the new, enhanced Print plugin for the GIMP is
+now only a small part of the package. Furthermore, the name
+Gutenprint recognizes Johannes Gutenberg, the inventor of the movable
+type printing press. Finally, the word "guten" means "good" in
+German.
+
+Gutenprint 5.0.0 is the first stable release of Gutenprint 5.0, and
+incorporates extensive feedback from the first release candidate. It
+is based on the Gimp-Print 4.3 series that has been in development for
+over three years, and includes many improvements over the very popular
+4.2 series.
Gutenprint currently supports over 700 printer models.
@@ -34,8 +34,9 @@ These release notes contain the following sections:
I) General Requirements
II) Changes from Previous Releases
- A) Changes from 5.0.0-rc2 to 5.0.0-rc3
- B) Changes from 5.0.0-rc1 to 5.0.0-rc2
+ A) Changes from 5.0.0-rc3 to 5.0.0
+ B) Changes from 5.0.0-rc2 to 5.0.0-rc3
+ C) Changes from 5.0.0-rc1 to 5.0.0-rc2
III) Overall changes from 4.2 to 5.0.
A) General user-visible changes
B) New Functionality
@@ -48,25 +49,6 @@ III) Overall changes from 4.2 to 5.0.
IV) Exceptions and Workarounds
A) General Issues
B) Build/Installation Issues
-V) Supported Printers
- A) List of Supported Printers
- B) Printer-specific notes
-VI) List of supported options
- A) Basic Printer Options
- B) Advanced Printer Options
- C) Specialized Printer Options
- D) Basic Output Controls
- E) Basic Output Adjustments
- F) Advanced Output Adjustments
- G) Output Density (Ink Quantity) Controls
- H) Gray Balance Controls
- I) Output Gamma Controls
- J) Gray Generation Controls
- K) Output Linearization Curves (GIMP Plugin Only)
- L) Detailed Color Correction Curves (GIMP Plugin Only)
- M) Specialized Output Controls
- N) Transition Controls
- O) Foomatic-Only Options
================================================================
@@ -102,13 +84,14 @@ output with any of the printers supported by this package. We
strongly recommend using CUPS with Gutenprint as a general-purpose
printing solution.
-The Print plug-in for the GIMP requires either the GIMP 2.0 or above,
-or 1.2.3 or above on the 1.2 line (1.2.5 is recommended). This
-plug-in will work with any printing system, and offers a comprehensive
-user interface to control all aspects of the printing process. If you
-are printing photographs in large format from the GIMP at very high
-resolution, disk space requirements may be substantial, and we
-recommend at least 2 GB of free disk space for that purpose.
+The enhanced Print plug-in for the GIMP requires either the GIMP 2.0
+or above, or 1.2.3 or above on the 1.2 line (1.2.5 is recommended).
+This plug-in will work with any printing system, and offers a
+comprehensive user interface to control all aspects of the printing
+process. If you are printing photographs in large format from the
+GIMP at very high resolution, disk space requirements may be
+substantial, and we recommend at least 2 GB of free disk space for
+that purpose.
The Ghostscript driver requires GNU Ghostscript 6.53 or higher, ESP
Ghostscript 7.05 or higher, or AFPL Ghostscript 7.04 or higher. It
@@ -138,7 +121,95 @@ for building and installing Gutenprint.
II) MAJOR CHANGES FROM PREVIOUS RELEASES
-A) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 2 AND
+A) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 3 AND
+ GUTENPRINT 5.0.0:
+
+ 1) A serious problem with margins when printing from CUPS in some
+ cases was introduced in Gutenprint 5.0.0-rc3. The symptoms are
+ that when printing certain kinds of material on certain printers,
+ the print is positioned incorrectly on the page (too far to the
+ right and too far down the page). This problem has been fixed.
+
+ 2) The Ghostscript driver used with Foomatic now prints all pages of
+ a document correctly. Previously it did not print any page
+ except the first page of a document, or printed all other pages
+ with possibly incorrect settings (bug 1501816).
+
+ 3) A new user's manual has been added in
+ doc/gutenprint-users-manual.odt (ODF format) and
+ doc/gutenprint-users-manual.pdf, replacing the old manual that
+ was based on Gimp-Print 4.2 (bug 1260142).
+
+ 4) The Postscript driver now handles PPD files with non-integer
+ imageable areas correctly in all locales (the PPD files certain
+ HP inkjet printers using the HPIJS driver have non-integer
+ imageable areas for some paper sizes). In 5.0.0-rc3, this was
+ handled incorrectly in locales that do not use the decimal point
+ (".") for separating fractions from integers.
+
+ 5) The PPD file parameter is now always accessible when using the
+ Postscript driver in third party Gutenprint-enabled applications.
+ This was not an issue with the enhanced Print plugin for the
+ GIMP.
+
+ 6) The Epson driver now chooses unidirectional vs. bidirectional
+ mode more intelligently on new printers that are capable of
+ producing excellent quality in bidirectional mode at high
+ resolutions. This improves printing speed with the default
+ settings in certain cases and in some cases improves print
+ quality.
+
+ 7) The Epson driver offers the same quality choices as 5.0.0-rc2 for
+ certain new printers such as the R800, R1800, and R2400. Certain
+ quality choices (in particular Super Photo and Ultra Photo) were
+ not available in 5.0.0-rc3.
+
+ 8) Various minor problems in the PPD files have been fixed. The
+ most notable change is that the names of the option groups have
+ been shortened so that they are shorter than 40 characters in all
+ cases except for one case in French.
+
+ 9) The French, Danish, Hungarian, and Swedish translations have been
+ updated.
+
+ 10) In the GIMP 2.4 and above (forthcoming as of Gutenprint 5.0
+ release), the enhanced Print plugin will be named "Print with
+ Gutenprint" so as not to collide with the GtkPrint-based plugin
+ bundled with that version of the GIMP. The Print plugin bundled
+ with GIMP 2.0 and 2.2 is based on Gimp-Print 4.2; the Print
+ plugin in this package simply replaces the Print plugin in those
+ versions of the GIMP (related to bug 1444700).
+
+ 11) Crashes in the Ghostscript and IJS drivers on certain non-Linux
+ platforms have been fixed (bug 1518126).
+
+ 12) A problem with margins with A4 paper on Kyocera printers has
+ been fixed (bug 1518131).
+
+ 13) A problem with the preview in the GIMP 1.2 plugin (which also
+ affects Cinepaint) not being updated properly if orientation
+ changes has been fixed.
+
+ 14) A problem with Foomatic data generation in certain locales has
+ been fixed (bug 1033007).
+
+ 15) The Epson Stylus Photo R800 and R1800 now print closer to the
+ bottom edge of the page.
+
+The following bugs open in prereleases have been fixed in Gutenprint
+5.0.0:
+
+1033007 Foomatic XML data generation is locale-dependent
+1260142 User documentation needs updating for 5.0.0
+1444700 print menu item on wrong position
+1501816 ijsgutenprint/foomatic only prints first page
+1518126 rastertogutenprint core dumps on Solaris 10
+1518131 Kyocera KM-2530 CUPS+Gutenprint PPD - A4 paper
+
+
+----------------
+
+B) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 2 AND
GUTENPRINT 5.0.0 RELEASE CANDIDATE 3:
1) The package now offers explicit support for many more printers.
@@ -180,9 +251,9 @@ A) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 2 AND
Printing to CD's works correctly whether or not full bleed mode
is selected.
- This change has no effect in the GIMP plugin and in other
- applications which directly use Gutenprint, as there was never
- any problem in those contexts.
+ This change has no effect in the enhanced GIMP plugin and in
+ other applications which directly use Gutenprint, as there was
+ never any problem in those contexts.
3) The IJS driver now correctly ejects the last page of a job.
Previously it did not always eject the last page with certain
@@ -310,7 +381,7 @@ A) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 2 AND
25) The package is now built with libtool 1.5.22.
-The following bugs have been fixed since Gutenprint 5.0.0-rc3:
+The following bugs have been fixed in Gutenprint 5.0.0-rc3:
1318890 Borderless print scaled wrongly
1379402 BJC-4400: SEGFAULT (photo-ink/color mode)
@@ -332,7 +403,7 @@ The following bugs have been fixed since Gutenprint 5.0.0-rc3:
----------------
-B) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 1 AND
+C) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 1 AND
GUTENPRINT 5.0.0 RELEASE CANDIDATE 2:
1) The Postscript driver now produces more accurate colors.
@@ -707,15 +778,17 @@ B) NEW FUNCTIONALITY:
----------------
-C) CHANGES TO THE PRINT PLUGIN FOR THE GIMP:
+C) CHANGES TO THE ENHANCED PRINT PLUGIN FOR THE GIMP:
- 1) A new plugin for the GIMP 2.x is now provided.
+ 1) A new plugin for the GIMP 2.x, enhanced with all new Gutenprint
+ 5.0 functionality, is now provided.
2) The Print plugin for the GIMP 1.2 is now deprecated and will be
withdrawn in 5.1 (the development release following 5.0). The
- Print plugin for the GIMP 1.2 will continue to be supported in
- all 5.0 releases, but no new functionality will be added
- following the release of 5.0.0.
+ Print plugin for the GIMP 1.2 will continue to be supported with
+ critical bug fixes in all 5.0 releases, but no new functionality
+ will be added, or non-critical bugs fixed, following the release
+ of 5.0.0.
3) The plugin now always displays the page preview with the top of
the page at the top of the preview pane, rotating the image
@@ -1185,11 +1258,12 @@ B) BUILD/INSTALLATION ISSUES
default location of Gutenprint installation is in /usr/local,
but system vendors typically install Gutenprint in /usr.
- iii) Gutenprint is built dynamically only (--disable-static). This
- is not a default, and requires the explicit --disable-static
- on the Gutenprint "configure" command line. Therefore, if you
- build Gutenprint normally you should not be vulnerable to this
- problem.
+ iii) Gutenprint is built dynamically only (--disable-static or
+ --disable-static-genppd). This is not a default, and requires
+ the explicit --disable-static or --disable-static-genppd on
+ the Gutenprint "configure" command line. Therefore, if you
+ build Gutenprint normally you should not be vulnerable to this
+ problem.
Note that in general if you install CUPS into a non-standard
location, and install Gutenprint into the same location, this
@@ -1199,21 +1273,23 @@ B) BUILD/INSTALLATION ISSUES
anywhere but /usr.
In this case, the run path embedded in the genppd executable
- points to the version of Gutenprint installed in /usr/lib. This
+ points to the version of Gutenprint installed in /usr/lib. This
run path overrides any attempt by libtool to look in the build
- directory. The result is that cups-genppd and rastertogutenprint
- are run against the older version of Gutenprint. If the new
- version contains additional features (more printers, etc.) they
- will not be available.
-
- This bug is difficult to detect in a normal build. It does not
- cause an error to happen during build; the only failure is that
- some PPD files may not be built or may be built with missing
- options. Due to the PPD version checking introduced in this
- release, the behavior might manifest itself as a runtime error.
- It is also possible that there will be no error at all other than
- the older version of Gutenprint being used, with the result that
- new features and bug fixes are not available.
+ directory. The result is that cups-genppd and rastertogutenprint
+ are run against the older version of Gutenprint. If the new
+ version contains additional features (more printers, changes to
+ printer options, etc.) they will not be available.
+
+ This bug is difficult to detect in a normal build. It normally
+ does not cause an error to happen during build unless there is an
+ API change from the version installed and the version being
+ built; the only failure is frequently that some PPD files may not
+ be built or may be built with missing options. Due to the PPD
+ version checking introduced in this release, the behavior might
+ manifest itself as a runtime error. It is also possible that
+ there will be no error at all other than the older version of
+ Gutenprint being used, with the result that new features and bug
+ fixes are not available.
If you wish to use only shared libraries, do not wish to build
static libraries at all, and are vulnerable to this issue
@@ -1538,1942 +1614,3 @@ B) BUILD/INSTALLATION ISSUES
will not require this workaround. This workaround is available
in the event that you cannot or do not wish to upgrade your
installation of the GIMP.
-
-
-================================================================
-
-V) SUPPORTED PRINTERS:
-
-A) LIST OF SUPPORTED PRINTERS
-
-The following is the complete list of printers believed to be
-compatible with Gutenprint, along with the name of the driver. Some
-of these printers may work only partially; the specified drivers may
-not support the full range of resolutions, paper sizes, media sources,
-etc. that some of these printers may offer.
-
-Our practice is to provide preliminary support for printers as soon as
-we have information sufficient to code a functioning driver, and to
-release this support even in an otherwise stable release. In this
-case, we note in the list below that support for a particular printer
-is "Experimental". It is likely that printers that are supported in
-"Experimental" mode will produce poor quality at some or all
-resolutions and in addition may not function correctly at some
-resolutions. Experimental Epson printers are most likely to produce
-good output at the highest resolution offered (2880x720, 2880x1440,
-2880x2880, or 5760x2880 DPI), since in general these printers will not
-use multiple drop sizes at such high resolutions.
-
-Note that Gutenprint supports only the printer in multi-function
-devices -- this package does not support scanning, fax, copying, or
-any other function. For scanning, please see the SANE project
-(http://www.sane-project.org).
-
-Printer Name Driver Name Notes
-------- ---- ------ ---- -----
-Apollo P-2100 pcl-apollo-p2100
-Apollo P-2150 pcl-apollo-p2150
-Apollo P-2200 pcl-apollo-p2200
-Apollo P-2250 pcl-apollo-p2250
-Apollo P-2500 pcl-apollo-p2500
-Apollo P-2550 pcl-apollo-p2550
-Apollo P-2600 pcl-apollo-p2600
-Apollo P-2650 pcl-apollo-p2650
-Apple Color StyleWriter 4100 pcl-apple-4100
-Apple Color StyleWriter 4500 pcl-apple-4500
-Apple Color StyleWriter 6500 pcl-apple-6500
-Apple LaserWriter Select 360 pcl-apple-lw360
-Brother DCP-1200 brother-dcp-1200
-Brother HL-4Ve brother-hl-4ve
-Brother HL-10V brother-hl-10v
-Brother HL-10h brother-hl-10h
-Brother HL-630 brother-hl-630
-Brother HL-660 brother-hl-660
-Brother HL-760 brother-hl-760
-Brother HL-960 brother-hl-960
-Brother HL-1040 brother-hl-1040
-Brother HL-1050 brother-hl-1050
-Brother HL-1060 brother-hl-1060
-Brother HL-1070 brother-hl-1070
-Brother HL-1240 brother-hl-1240
-Brother HL-1250 brother-hl-1250
-Brother HL-1260 brother-hl-1260
-Brother HL-1270N brother-hl-1270n
-Brother HL-1440 brother-hl-1440
-Brother HL-1660e brother-hl-1660e
-Brother HL-2060 brother-hl-2060
-Brother MFC-6550MC brother-mfc-6550mc
-Brother MFC-8300 brother-mfc-8300
-Brother MFC-9500 brother-mfc-9500
-Brother MFC-9600 brother-mfc-9600
-Canon BJ-30 bjc-30
-Canon BJC-50 bjc-50
-Canon BJC-55 bjc-55
-Canon BJC-80 bjc-80
-Canon BJC-85 bjc-85
-Canon BJC-210 bjc-210
-Canon BJC-240 bjc-240
-Canon BJC-250 bjc-250
-Canon BJC-1000 bjc-1000
-Canon BJC-2000 bjc-2000
-Canon BJC-2010 bjc-2010
-Canon BJC-2100 bjc-2100
-Canon BJC-2110 bjc-2110
-Canon BJC-3000 bjc-3000
-Canon BJC-4000 bjc-4000
-Canon BJC-4300 bjc-4300
-Canon BJC-4400 bjc-4400
-Canon BJC-6000 bjc-6000
-Canon BJC-6100 bjc-6100
-Canon BJC-6200 bjc-6200
-Canon BJC-6500 bjc-6500
-Canon BJC-7000 bjc-7000
-Canon BJC-7100 bjc-7100
-Canon BJC-8200 bjc-8200
-Canon CP-100 canon-cp100
-Canon CP-200 canon-cp200
-Canon CP-220 canon-cp220
-Canon CP-300 canon-cp300
-Canon CP-330 canon-cp330
-Canon GP 335 canon-gp_335
-Canon LBP-4sx canon-lbp-4sx
-Canon LBP-430 canon-lbp-430
-Canon LBP-1000 canon-lbp-1000
-Canon LBP-1260 canon-lbp-1260
-Canon LBP-1760 canon-lbp-1760
-Canon S100 bjc-s100
-Canon S200 bjc-s200 Experimental
-Canon S300 bjc-s300
-Canon S400 bjc-s400
-Canon S450 bjc-s450
-Canon S500 bjc-s500
-Canon S600 bjc-s600
-Canon S630 bjc-s630
-Canon S800 bjc-s800
-Canon S4500 bjc-s4500
-Canon SELPHY-CP-400 canon-cp400
-Canon SELPHY-CP-500 canon-cp500
-Canon SELPHY-CP-510 canon-cp510
-Canon SELPHY-CP-600 canon-cp600
-Canon SELPHY-CP-710 canon-cp710
-Canon iP4000 bjc-iP4000 Experimental
-Canon imageRunner 330s canon-ir_330s
-Citizen ProJet II citizen-projet_ii
-DEC 1800 dec-1800
-DEC LN17 dec-ln17
-Epson ActionLaser 1100 epson-actl_1100
-Epson ActionLaser II epson-actl_ii
-Epson AcuLaser C2000 epson-acl_c2000
-Epson AcuLaser C2000PS epson-acl_c2000ps
-Epson AcuLaser C8500 epson-acl_c8500
-Epson AcuLaser C8500PS epson-acl_c8500ps
-Epson AcuLaser C8600 epson-acl_c8600
-Epson AcuLaser C8600PS epson-acl_c8600ps
-Epson EPL-5200 epson-epl-5200
-Epson EPL-5200+ epson-epl-5200plus
-Epson EPL-5700 epson-epl-5700
-Epson EPL-5700PS epson-epl-5700ps
-Epson EPL-5800 epson-epl-5800
-Epson EPL-5800PS epson-epl-5800ps
-Epson EPL-5900 epson-epl-5900
-Epson EPL-5900PS epson-epl-5900ps
-Epson EPL-6100 epson-epl-6100
-Epson EPL-6100PS epson-epl-6100ps
-Epson EPL-7100 epson-epl-7100
-Epson Stylus C20 escp2-c20
-Epson Stylus C20SX escp2-c20sx
-Epson Stylus C20UX escp2-c20ux
-Epson Stylus C40 escp2-c40
-Epson Stylus C40SX escp2-c40sx
-Epson Stylus C40UX escp2-c40ux
-Epson Stylus C41 escp2-c41
-Epson Stylus C41SX escp2-c41sx
-Epson Stylus C41UX escp2-c41ux
-Epson Stylus C42 escp2-c42
-Epson Stylus C42SX escp2-c42sx
-Epson Stylus C42UX escp2-c42ux
-Epson Stylus C43 escp2-c43
-Epson Stylus C43SX escp2-c43sx
-Epson Stylus C43UX escp2-c43ux
-Epson Stylus C44 escp2-c44
-Epson Stylus C44SX escp2-c44sx
-Epson Stylus C44UX escp2-c44ux
-Epson Stylus C45 escp2-c45
-Epson Stylus C46 escp2-c46
-Epson Stylus C48 escp2-c48
-Epson Stylus C50 escp2-c50
-Epson Stylus C60 escp2-c60
-Epson Stylus C61 escp2-c61
-Epson Stylus C62 escp2-c62
-Epson Stylus C63 escp2-c63
-Epson Stylus C64 escp2-c64
-Epson Stylus C65 escp2-c65
-Epson Stylus C66 escp2-c66
-Epson Stylus C68 escp2-c68
-Epson Stylus C70 escp2-c70
-Epson Stylus C80 escp2-c80
-Epson Stylus C82 escp2-c82
-Epson Stylus C83 escp2-c83
-Epson Stylus C84 escp2-c84
-Epson Stylus C85 escp2-c85
-Epson Stylus C86 escp2-c86
-Epson Stylus C88 escp2-c88
-Epson Stylus Color escp2
-Epson Stylus Color I escp2-i
-Epson Stylus Color II escp2-ii
-Epson Stylus Color IIs escp2-iis
-Epson Stylus Color PRO escp2-pro
-Epson Stylus Pro XL escp2-pro-xl
-Epson Stylus Color 400 escp2-400
-Epson Stylus Color 440 escp2-440
-Epson Stylus Color 460 escp2-460
-Epson Stylus Color 480 escp2-480
-Epson Stylus Color 500 escp2-500
-Epson Stylus Color 580 escp2-580
-Epson Stylus Color 600 escp2-600
-Epson Stylus Color 640 escp2-640
-Epson Stylus Color 660 escp2-660
-Epson Stylus Color 670 escp2-670
-Epson Stylus Color 680 escp2-680
-Epson Stylus Color 740 escp2-740
-Epson Stylus Color 760 escp2-760
-Epson Stylus Color 777 escp2-777
-Epson Stylus Color 800 escp2-800
-Epson Stylus Color 850 escp2-850
-Epson Stylus Color 860 escp2-860
-Epson Stylus Color 880 escp2-880
-Epson Stylus Color 8 3 escp2-83
-Epson Stylus Color 900 escp2-900
-Epson Stylus Color 980 escp2-980
-Epson Stylus Color 1160 escp2-1160
-Epson Stylus Color 1500 escp2-1500
-Epson Stylus Color 1520 escp2-1520
-Epson Stylus Color 3000 escp2-3000
-Epson Stylus Photo escp2-photo
-Epson Stylus Photo 700 escp2-700
-Epson Stylus Photo EX escp2-ex
-Epson Stylus Photo EX3 escp2-ex3
-Epson Stylus Photo 720 escp2-720
-Epson Stylus Photo 750 escp2-750
-Epson Stylus Photo 780 escp2-780
-Epson Stylus Photo 785 escp2-785
-Epson Stylus Photo 790 escp2-790
-Epson Stylus Photo 810 escp2-810
-Epson Stylus Photo 820 escp2-820
-Epson Stylus Photo 825 escp2-825
-Epson Stylus Photo 830 escp2-830
-Epson Stylus Photo 830U escp2-830u
-Epson Stylus Photo 870 escp2-870
-Epson Stylus Photo 875 escp2-875
-Epson Stylus Photo 890 escp2-890
-Epson Stylus Photo 895 escp2-895
-Epson Stylus Photo 900 escp2-ph900
-Epson Stylus Photo 915 escp2-915
-Epson Stylus Photo 925 escp2-925
-Epson Stylus Photo 935 escp2-935
-Epson Stylus Photo 950 escp2-950
-Epson Stylus Photo 960 escp2-960
-Epson Stylus Photo 1200 escp2-1200
-Epson Stylus Photo 1270 escp2-1270
-Epson Stylus Photo 1280 escp2-1280
-Epson Stylus Photo 1290 escp2-1290
-Epson Stylus Photo 2000P escp2-2000
-Epson Stylus Photo 2100 escp2-2100
-Epson Stylus Photo 2200 escp2-2200
-Epson Stylus Photo R200 escp2-r200
-Epson Stylus Photo R210 escp2-r210
-Epson Stylus Photo R220 escp2-r220
-Epson Stylus Photo R300 escp2-r300
-Epson Stylus Photo R310 escp2-r310
-Epson Stylus Photo R320 escp2-r320
-Epson Stylus Photo R340 escp2-r340
-Epson Stylus Photo RX400 escp2-rx400
-Epson Stylus Photo RX420 escp2-rx420
-Epson Stylus Photo RX425 escp2-rx425
-Epson Stylus Photo RX430 escp2-rx430
-Epson Stylus Photo RX500 escp2-rx500
-Epson Stylus Photo RX510 escp2-rx510
-Epson Stylus Photo RX600 escp2-rx600
-Epson Stylus Photo RX620 escp2-rx620
-Epson Stylus Photo RX630 escp2-rx630
-Epson Stylus Photo RX700 escp2-rx700
-Epson Stylus Photo R800 escp2-r800
-Epson Stylus Photo R1800 escp2-r1800
-Epson Stylus Photo R2400 escp2-r2400
-Epson Stylus Pro 5000 escp2-5000
-Epson Stylus Pro 5500 escp2-5500
-Epson Stylus Pro 7000 escp2-7000
-Epson Stylus Pro 7500 escp2-7500
-Epson Stylus Pro 7600 escp2-7600
-Epson Stylus Pro 9000 escp2-9000
-Epson Stylus Pro 9500 escp2-9500
-Epson Stylus Pro 9600 escp2-9600
-Epson Stylus Pro 10000 escp2-10000
-Epson Stylus Scan 2000 escp2-scan2000
-Epson Stylus Scan 2500 escp2-scan2500
-Epson Stylus CX1500 escp2-cx1500
-Epson Stylus CX3100 escp2-cx3100
-Epson Stylus CX3200 escp2-cx3200
-Epson Stylus CX3500 escp2-cx3500
-Epson Stylus CX3600 escp2-cx3600
-Epson Stylus CX3650 escp2-cx3650
-Epson Stylus CX3700 escp2-cx3700
-Epson Stylus CX3800 escp2-cx3800
-Epson Stylus CX3805 escp2-cx3805
-Epson Stylus CX3810 escp2-cx3810
-Epson Stylus CX4100 escp2-cx4100
-Epson Stylus CX4200 escp2-cx4200
-Epson Stylus CX4500 escp2-cx4500
-Epson Stylus CX4600 escp2-cx4600
-Epson Stylus CX4700 escp2-cx4700
-Epson Stylus CX4800 escp2-cx4800
-Epson Stylus CX5100 escp2-cx5100
-Epson Stylus CX5200 escp2-cx5200
-Epson Stylus CX5300 escp2-cx5300
-Epson Stylus CX5400 escp2-cx5400
-Epson Stylus CX5700 escp2-cx5700
-Epson Stylus CX5800 escp2-cx5800
-Epson Stylus CX6300 escp2-cx6300
-Epson Stylus CX6400 escp2-cx6400
-Epson Stylus CX6500 escp2-cx6500
-Epson Stylus CX6600 escp2-cx6600
-Epson Stylus CX7700 escp2-cx7700
-Epson Stylus CX7800 escp2-cx7800
-Epson Stylus CX8300 escp2-cx8300
-Epson Stylus CX8400 escp2-cx8400
-Epson Stylus D68 escp2-d68
-Epson Stylus D88 escp2-d88
-Epson Stylus DX3800 escp2-dx3800
-Epson Stylus DX3850 escp2-dx3850
-Epson Stylus DX4200 escp2-dx4200
-Epson Stylus DX4250 escp2-dx4250
-Epson Stylus DX4800 escp2-dx4800
-Epson PictureMate escp2-picmate
-Epson PictureMate Deluxe escp2-picmated
-Epson CL 700 escp2-cl700
-Epson CL 750 escp2-cl750
-Epson CL 760 escp2-cl760 Experimental
-Epson E 100 escp2-e100
-Epson E 150 escp2-e150
-Epson E 200 escp2-e200
-Epson EM 900C escp2-em900c
-Epson EM 930C escp2-em930c
-Epson MC 2000 escp2-mc2000
-Epson MC 5000 escp2-mc5000
-Epson MC 7000 escp2-mc7000
-Epson MC 9000 escp2-mc9000
-Epson MC 10000 escp2-mc10000
-Epson MJ 930C escp2-mj930c
-Epson MJ 5100C escp2-mj5100c
-Epson MJ 6000C escp2-mj6000c
-Epson MJ 8000C escp2-mj8000c
-Epson PM 700C escp2-pm700c
-Epson PM 730C escp2-pm730c
-Epson PM 740C escp2-pm740c Experimental
-Epson PM 750C escp2-pm750c
-Epson PM 760C escp2-pm760c
-Epson PM 770C escp2-pm770c
-Epson PM 780C escp2-pm780c
-Epson PM 790PT escp2-pm790pt
-Epson PM 800C escp2-pm800c
-Epson PM 850PT escp2-pm850pt
-Epson PM 870C escp2-pm870c Experimental
-Epson PM 880C escp2-pm880c
-Epson PM 930C escp2-pm930c Experimental
-Epson PM 940C escp2-pm940c Experimental
-Epson PM 950C escp2-pm950c
-Epson PM 970C escp2-pm970c Experimental
-Epson PM 980C escp2-pm980c Experimental
-Epson PM 2000C escp2-pm2000c
-Epson PM 2200C escp2-pm2200c
-Epson PM 3000C escp2-pm3000c
-Epson PM 3300C escp2-pm3300c
-Epson PM 3500C escp2-pm3500c
-Epson PM 3700C escp2-pm3700c Experimental
-Epson PM 4000PX escp2-pm4000px
-Epson PM 5000C escp2-pm5000c
-Epson PM 7000C escp2-pm7000c
-Epson PM 9000C escp2-pm9000c
-Epson PM 10000 escp2-pm10000
-Epson PM A650 escp2-pma650 Experimental
-Epson PM A750 escp2-pma750 Experimental
-Epson PM A890 escp2-pma890 Experimental
-Epson PM A900 escp2-pma900
-Epson PM A950 escp2-pma950
-Epson PM D600 escp2-pmd600 Experimental
-Epson PM D750 escp2-pmd750
-Epson PM D770 escp2-pmd770
-Epson PM D800 escp2-pmd800 Experimental
-Epson PM D1000 escp2-pmd1000
-Epson PM G700 escp2-pmg700
-Epson PM G720 escp2-pmg720
-Epson PM G730 escp2-pmg730
-Epson PM G800 escp2-pmg800 Experimental
-Epson PM G820 escp2-pmg820 Experimental
-Epson PX A650 escp2-pxa650
-Epson PX G900 escp2-pxg900
-Epson PX G920 escp2-pxg920
-Epson PX G5000 escp2-pxg5000
-Epson PX V500 escp2-pxv500
-Epson PX V600 escp2-pxv600
-Epson PX V630 escp2-pxv630
-Epson PX 5500 escp2-px5500
-Epson PX 7000 escp2-px7000
-Epson PX 9000 escp2-px9000
-Fujifilm Printpix-CX-400 fujifilm-cx400
-Fujifilm Printpix-CX-550 fujifilm-cx550
-Fujitsu PrintPartner 10V fujitsu-pp_10v
-Fujitsu PrintPartner 16DV fujitsu-pp_16dv
-Fujitsu PrintPartner 20W fujitsu-pp_20w
-Fujitsu PrintPartner 8000 fujitsu-pp_8000
-Generic PCL 4 Printer pcl-g_4
-Generic PCL 5 Printer pcl-g_5
-Generic PCL 5c Printer pcl-g_5c
-Generic PCL 5e Printer pcl-g_5e
-Generic PCL 6/PCL XL Printer pcl-g_6
-HP Business Inkjet 2200 hp-bij_2200
-HP Business Inkjet 2230 hp-bij_2230
-HP Business Inkjet 2250 hp-bij_2250
-HP Business Inkjet 2250TN hp-bij_2250tn
-HP Business Inkjet 2280 hp-bij_2280
-HP Color Inkjet Printer CP1160 hp-cij_cp1160
-HP Color Inkjet Printer CP1700 hp-cij_cp1700
-HP Color LaserJet 2500 hp-clj_2500
-HP Color LaserJet 4500 hp-clj_4500
-HP Color LaserJet 4550 hp-clj_4550
-HP Color LaserJet 4600 hp-clj_4600
-HP Color LaserJet 5 hp-clj_5
-HP Color LaserJet 5000 hp-clj_5000
-HP Color LaserJet 5500 hp-clj_5500
-HP Color LaserJet 8550GN hp-clj_8550gn
-HP DesignJet 230 pcl-desnj-230
-HP DesignJet 250C pcl-desnj-250
-HP DesignJet 430 pcl-desnj-430
-HP DesignJet 450C pcl-desnj-450
-HP DesignJet 455CA pcl-desnj-455
-HP DesignJet 488CA pcl-desnj-488
-HP DesignJet 700 pcl-desnj-700
-HP DesignJet 750C Plus hp-desnj_750c_plus
-HP DesignJet 750C pcl-750
-HP DesignJet 2500CP pcl-desnj-2500
-HP DesignJet 3500CP pcl-desnj-3500
-HP DesignJet ColorPro CAD hp-desnj_cp_cad
-HP DeskJet 400 pcl-400
-HP DeskJet 420C hp-dj_420c
-HP DeskJet 450 hp-dj_450
-HP DeskJet 500 pcl-500
-HP DeskJet 500C pcl-501
-HP DeskJet 505J Plus hp-dj_505j_plus
-HP DeskJet 510 hp-dj_510
-HP DeskJet 520 pcl-520
-HP DeskJet 540C pcl-540
-HP DeskJet 550C pcl-550
-HP DeskJet 5550 hp-dj_5550
-HP DeskJet 5551 hp-dj_5551
-HP DeskJet 560C pcl-560
-HP DeskJet 600 pcl-600
-HP DeskJet 600C pcl-601
-HP DeskJet 610C hp-dj_610c
-HP DeskJet 610CL hp-dj_610cl
-HP DeskJet 6122 hp-dj_6122
-HP DeskJet 6127 hp-dj_6127
-HP DeskJet 612C hp-dj_612c
-HP DeskJet 640C hp-dj_640c
-HP DeskJet 648C hp-dj_648c
-HP DeskJet 660C hp-dj_660c
-HP DeskJet 670C hp-dj_670c
-HP DeskJet 670TV hp-dj_670tv
-HP DeskJet 672C hp-dj_672c
-HP DeskJet 680C hp-dj_680c
-HP DeskJet 682C hp-dj_682c
-HP DeskJet 690C pcl-690
-HP DeskJet 692C hp-dj_692c
-HP DeskJet 693C hp-dj_693c
-HP DeskJet 694C hp-dj_694c
-HP DeskJet 695C hp-dj_695c
-HP DeskJet 697C hp-dj_697c
-HP DeskJet 810C pcl-810
-HP DeskJet 812C pcl-812
-HP DeskJet 815C hp-dj_815c
-HP DeskJet 816C hp-dj_816c
-HP DeskJet 825C hp-dj_825c
-HP DeskJet 830C hp-dj_830c
-HP DeskJet 832C hp-dj_832c
-HP DeskJet 840C pcl-840
-HP DeskJet 841C hp-dj_841c
-HP DeskJet 842C pcl-842
-HP DeskJet 843C hp-dj_843c
-HP DeskJet 845C pcl-845
-HP DeskJet 850C pcl-850
-HP DeskJet 855C pcl-855
-HP DeskJet 870C pcl-870
-HP DeskJet 880C hp-dj_880c
-HP DeskJet 882C hp-dj_882c
-HP DeskJet 890C pcl-890
-HP DeskJet 895C pcl-895
-HP DeskJet 916C pcl-900
-HP DeskJet 920C hp-dj_920c
-HP DeskJet 9300 hp-dj_9300
-HP DeskJet 930C hp-dj_930c
-HP DeskJet 932C hp-dj_932c
-HP DeskJet 933C hp-dj_933c
-HP DeskJet 934C hp-dj_934c
-HP DeskJet 935C hp-dj_935c
-HP DeskJet 940C hp-dj_940c
-HP DeskJet 948C hp-dj_948c
-HP DeskJet 950C hp-dj_950c
-HP DeskJet 952C hp-dj_952c
-HP DeskJet 955C hp-dj_955c
-HP DeskJet 957C hp-dj_957c
-HP DeskJet 959C hp-dj_959c
-HP DeskJet 960C hp-dj_960c
-HP DeskJet 970C hp-dj_970c
-HP DeskJet 975C hp-dj_975c
-HP DeskJet 980C hp-dj_980c
-HP DeskJet 990C hp-dj_990c
-HP DeskJet 995C hp-dj_995c
-HP DeskJet 1100C pcl-1100
-HP DeskJet 1120C pcl-1120
-HP DeskJet 1125C hp-dj_1125c
-HP DeskJet 1200C pcl-1200
-HP DeskJet 1220C pcl-1220
-HP DeskJet 1600C pcl-1600
-HP DeskJet 1600CM hp-dj_1600cm
-HP DeskJet 2000 pcl-2000
-HP DeskJet 2500 pcl-2500
-HP DeskJet 2500CM hp-2500cm
-HP DeskJet 340C pcl-340
-HP DeskJet 3810 hp-dj_3810
-HP DeskJet 3816 hp-dj_3816
-HP DeskJet 3820 hp-dj_3820
-HP DeskJet 3822 hp-dj_3822
-HP LaserJet 2 pcl-2
-HP LaserJet 2D hp-lj_2d
-HP LaserJet 2P Plus hp-lj_2p_plus
-HP LaserJet 2P pcl-2p
-HP LaserJet 3 pcl-3
-HP LaserJet 3D hp-lj_3d
-HP LaserJet 3P w/ PCL5 hp-lj_3p_w_pcl5
-HP LaserJet 3P w/PS hp-lj_3p_w_ps
-HP LaserJet 4 Plus hp-lj_4_plus
-HP LaserJet 4 pcl-4
-HP LaserJet 4L pcl-4l
-HP LaserJet 4M hp-lj_4m
-HP LaserJet 4ML hp-lj_4ml
-HP LaserJet 4P hp-lj_4p
-HP LaserJet 4Si pcl-4si
-HP LaserJet 4V pcl-4v
-HP LaserJet 5 pcl-5
-HP LaserJet 5L hp-lj_5l
-HP LaserJet 5M hp-lj_5m
-HP LaserJet 5MP hp-lj_5mp
-HP LaserJet 5P hp-lj_5p
-HP LaserJet 5Si pcl-5si
-HP LaserJet 6 pcl-6
-HP LaserJet 6L hp-lj_6l
-HP LaserJet 6MP hp-lj_6mp
-HP LaserJet 6P hp-lj_6p
-HP LaserJet 1010 hp-lj_1010
-HP LaserJet 1012 hp-lj_1012
-HP LaserJet 1015 hp-lj_1015
-HP LaserJet 1100 hp-lj_1100
-HP LaserJet 1100A hp-lj_1100a
-HP LaserJet 1150 hp-lj_1150
-HP LaserJet 1200 hp-lj_1200
-HP LaserJet 1220 hp-lj_1220
-HP LaserJet 1300 hp-lj_1300
-HP LaserJet 2100 hp-lj_2100
-HP LaserJet 2100M hp-lj_2100m
-HP LaserJet 2200 hp-lj_2200
-HP LaserJet 2300 hp-lj_2300
-HP LaserJet 3200 hp-lj_3200
-HP LaserJet 3200m hp-lj_3200m
-HP LaserJet 3200se hp-lj_3200se
-HP LaserJet 3300 MFP hp-lj_3300_mfp
-HP LaserJet 3310 MFP hp-lj_3310_mfp
-HP LaserJet 3320 MFP hp-lj_3320_mfp
-HP LaserJet 3320N MFP hp-lj_3320n_mfp
-HP LaserJet 3330 MFP hp-lj_3330_mfp
-HP LaserJet 4000 hp-lj_4000
-HP LaserJet 4050 hp-lj_4050
-HP LaserJet 4100 hp-lj_4100
-HP LaserJet 4200 hp-lj_4200
-HP LaserJet 4300 hp-lj_4300
-HP LaserJet 5000 hp-lj_5000
-HP LaserJet 5100 hp-lj_5100
-HP LaserJet 8000 hp-lj_8000
-HP LaserJet 8100 hp-lj_8100
-HP LaserJet 8150 hp-lj_8150
-HP LaserJet 9000 hp-lj_9000
-HP Mopier 240 hp-mopier_240
-HP Mopier 320 hp-mopier_320
-HP OfficeJet 300 hp-oj_300
-HP OfficeJet 330 hp-oj_330
-HP OfficeJet 350 hp-oj_350
-HP OfficeJet 500 hp-oj_500
-HP OfficeJet 520 hp-oj_520
-HP OfficeJet 570 hp-oj_570
-HP OfficeJet 580 hp-oj_580
-HP OfficeJet 590 hp-oj_590
-HP OfficeJet 600 hp-oj_600
-HP OfficeJet 610 hp-oj_610
-HP OfficeJet 625 hp-oj_625
-HP OfficeJet 630 hp-oj_630
-HP OfficeJet 635 hp-oj_635
-HP OfficeJet 700 hp-oj_700
-HP OfficeJet 710 hp-oj_710
-HP OfficeJet 720 hp-oj_720
-HP OfficeJet 725 hp-oj_725
-HP OfficeJet 5105 hp-oj_5105
-HP OfficeJet 5110 hp-oj_5110
-HP OfficeJet 5110xi hp-oj_5110xi
-HP OfficeJet 6105 hp-oj_6105
-HP OfficeJet 6110 hp-oj_6110
-HP OfficeJet 7110 hp-oj_7110
-HP OfficeJet 7130 hp-oj_7130
-HP OfficeJet 7140 hp-oj_7140
-HP OfficeJet D125 hp-oj_d125
-HP OfficeJet D135 hp-oj_d135
-HP OfficeJet D145 hp-oj_d145
-HP OfficeJet D155 hp-oj_d155
-HP OfficeJet G55 hp-oj_g55
-HP OfficeJet G85 hp-oj_g85
-HP OfficeJet G95 hp-oj_g95
-HP OfficeJet K60 hp-oj_k60
-HP OfficeJet K60xi hp-oj_k60xi
-HP OfficeJet K80 hp-oj_k80
-HP OfficeJet K80xi hp-oj_k80xi
-HP OfficeJet LX hp-oj_lx
-HP OfficeJet Pro 1150C hp-oj_pro_1150c
-HP OfficeJet Pro 1170C hp-oj_pro_1170c
-HP OfficeJet Pro 1175C hp-oj_pro_1175c
-HP OfficeJet R40 hp-oj_r40
-HP OfficeJet R45 hp-oj_r45
-HP OfficeJet R60 hp-oj_r60
-HP OfficeJet R65 hp-oj_r65
-HP OfficeJet R80 hp-oj_r80
-HP OfficeJet T45 hp-oj_t45
-HP OfficeJet T65 hp-oj_t65
-HP OfficeJet V40 hp-oj_v40
-HP OfficeJet V40xi hp-oj_v40xi
-HP OfficeJet hp-oj
-HP PSC 370 hp-psc_370
-HP PSC 380 hp-psc_380
-HP PSC 500 hp-psc_500
-HP PSC 750 hp-psc_750
-HP PSC 950 hp-psc_950
-HP PSC 950xi hp-psc_950xi
-HP PSC 2110 hp-psc_2110
-HP PSC 2150 hp-psc_2150
-HP PSC 2210 hp-psc_2210
-HP PhotoSmart 7150 hp-psc_7150
-HP PhotoSmart 7345 hp-psc_7345
-HP PhotoSmart 7350 hp-psc_7350
-HP PhotoSmart 7550 hp-psc_7550
-HP PhotoSmart P100 hp-psc_p100
-HP PhotoSmart P130 hp-psc_p130
-HP PhotoSmart P230 hp-psc_p230
-HP PhotoSmart P1000 pcl-P1000
-HP PhotoSmart P1100 pcl-P1100
-HP PhotoSmart P1115 hp-psc_p1115
-HP PhotoSmart P1215 hp-psc_p1215
-HP PhotoSmart P1218 hp-psc_p1218
-HP PhotoSmart P1315 hp-psc_p1315
-HP e-printer e20 hp-e-printer_e20
-IBM 4019 ibm-4019
-IBM 4029 030 LaserPrinter 10 ibm-4029_030_lp_10
-IBM 4312 ibm-4312
-IBM Infoprint 12 ibm-infoprint_12
-IBM Page Printer 3112 ibm-pp_3112
-Infotec 4651 MF infotec-4651_mf
-Kyocera F-1010 kyocera-f-1010
-Kyocera FS-600 (KPDL-2) kyocera-fs-600_kpdl-2
-Kyocera FS-600 kyocera-fs-600
-Kyocera FS-680 kyocera-fs-680
-Kyocera FS-800 kyocera-fs-800
-Kyocera FS-1000 kyocera-fs-1000
-Kyocera FS-1000+ kyocera-fs-1000plus
-Kyocera FS-1010 kyocera-fs-1010
-Kyocera FS-1050 kyocera-fs-1050
-Kyocera FS-1200 kyocera-fs-1200
-Kyocera FS-1600 kyocera-fs-1600
-Kyocera FS-1600+ kyocera-fs-1600plus
-Kyocera FS-1700 kyocera-fs-1700
-Kyocera FS-1700+ kyocera-fs-1700plus
-Kyocera FS-1750 kyocera-fs-1750
-Kyocera FS-1800 kyocera-fs-1800
-Kyocera FS-1800+ kyocera-fs-1800plus
-Kyocera FS-1900 kyocera-fs-1900
-Kyocera FS-3500 kyocera-fs-3500
-Kyocera FS-3600 kyocera-fs-3600
-Kyocera FS-3600+ kyocera-fs-3600plus
-Kyocera FS-3700 kyocera-fs-3700
-Kyocera FS-3700+ kyocera-fs-3700plus
-Kyocera FS-3750 kyocera-fs-3750
-Kyocera FS-3800 kyocera-fs-3800
-Kyocera FS-5800C kyocera-fs-5800c
-Kyocera FS-5900C kyocera-fs-5900c
-Kyocera FS-6500 kyocera-fs-6500
-Kyocera FS-6500+ kyocera-fs-6500plus
-Kyocera FS-6700 kyocera-fs-6700
-Kyocera FS-7000 kyocera-fs-7000
-Kyocera FS-7000+ kyocera-fs-7000plus
-Kyocera FS-8000C kyocera-fs-8000c
-Kyocera FS-9000 kyocera-fs-9000
-Kyocera FS-9100DN kyocera-fs-9100dn
-Kyocera FS-9500DN kyocera-fs-9500dn
-Kyocera KM-1530 kyocera-km-1530
-Kyocera KM-1810 kyocera-km-1810
-Kyocera KM-2030 kyocera-km-2030
-Kyocera KM-2530 kyocera-km-2530
-Kyocera KM-3530 kyocera-km-3530
-Kyocera KM-4230 kyocera-km-4230
-Kyocera KM-4530 kyocera-km-4530
-Kyocera KM-5230 kyocera-km-5230
-Kyocera KM-5530 kyocera-km-5530
-Kyocera KM-6230 kyocera-km-6230
-Lexmark 4076 lexmark-4076
-Lexmark Optra E lexmark-optra_e
-Lexmark Optra E+ lexmark-optra_eplus
-Lexmark Valuewriter 300 lexmark-vw_300
-Lexmark Z42 lexmark-z42
-Lexmark Z43 lexmark-z43
-Lexmark Z52 lexmark-z52
-Lexmark Z53 lexmark-z53
-Minolta PagePro 1100 minolta-pp_1100
-Minolta PagePro 6 minolta-pp_6
-Minolta PagePro 6e minolta-pp_6e
-Minolta PagePro 6ex minolta-pp_6ex
-Minolta PagePro 8 minolta-pp_8
-Minolta PagePro 8L minolta-pp_8l
-NEC SuperScript 1260 nec-ssc_1260
-NEC SuperScript 1400 nec-ssc_1400
-NEC SuperScript 1800 nec-ssc_1800
-NEC SuperScript 660i nec-ssc_660i
-NEC SuperScript 860 nec-ssc_860
-NEC SuperScript 870 nec-ssc_870
-Okidata OL400 okidata-ol400
-Okidata OL400e okidata-ol400e
-Okidata OL400ex okidata-ol400ex
-Okidata OL410e okidata-ol410e
-Okidata OL600e okidata-ol600e
-Okidata OL610e/S okidata-ol610e_s
-Okidata OL800 okidata-ol800
-Okidata OL810ex okidata-ol810ex
-Okidata Okipage 6e okidata-okp_6e
-Okidata Okipage 6ex okidata-okp_6ex
-Okidata Okipage 8p okidata-okp_8p
-Okidata Okipage 10e okidata-okp_10e
-Okidata Okipage 10ex okidata-okp_10ex
-Okidata Okipage 14ex okidata-okp_14ex
-Okidata Super 6e okidata-super_6e
-Olivetti JP350S olivetti-jp350s
-Olivetti PG 306 olivetti-pg_306
-Olympus P-10 olympus-p10
-Olympus P-11 olympus-p11
-Olympus P-200 olympus-p200
-Olympus P-300 olympus-p300
-Olympus P-300E olympus-p300e
-Olympus P-300U olympus-p300u
-Olympus P-330E olympus-p330e
-Olympus P-330NE olympus-p330ne
-Olympus P-400 olympus-p400
-Olympus P-440 olympus-p440
-PCPI 1030 pcpi-1030
-Panasonic KX-P4410 panasonic-kx-p4410
-Panasonic KX-P4450 panasonic-kx-p4450
-Panasonic KX-P6150 panasonic-kx-p6150
-Panasonic KX-P6500 panasonic-kx-p6500
-Raven LP-410 raven-lp-410
-Ricoh Aficio 220 ricoh-afc_220
-Ricoh Aficio 401 ricoh-afc_401
-Ricoh Aficio 700 ricoh-afc_700
-Samsung ML-85 samsung-ml-85
-Samsung ML-4600 samsung-ml-4600
-Samsung ML-5000a samsung-ml-5000a
-Samsung ML-6000 samsung-ml-6000
-Samsung ML-6100 samsung-ml-6100
-Samsung ML-7000 samsung-ml-7000
-Samsung ML-7000N samsung-ml-7000n
-Samsung ML-7000P samsung-ml-7000p
-Samsung ML-7050 samsung-ml-7050
-Samsung QL-5100A samsung-ql-5100a
-Samsung QL-6050 samsung-ql-6050
-Seiko SpeedJET 200 seiko-sj_200
-Sharp AR-161 sharp-ar-161
-Sony IJP-V100 sony-ijp-v100
-Sony UP-DP10 sony-updp10 Experimental
-Sony UP-DR150 sony-updr150 Experimental
-Star LS-04 star-ls-04
-Star LaserPrinter 8 star-lp_8
-Tally MT908 tally-mt908
-Xerox Able 1406 xerox-able_1406
-Xerox DocuPrint 4508 xerox-dp_4508
-Xerox DocuPrint C20 xerox-dp_c20
-Xerox DocuPrint N4512 xerox-dp_n4512
-Xerox DocuPrint N4512PS xerox-dp_n4512ps
-Xerox DocuPrint P12 xerox-dp_p12
-Xerox DocuPrint P1202 xerox-dp_p1202
-Xerox DocuPrint P8e xerox-dp_p8e
-Xerox Document Centre 400 xerox-dc_400
-
-
-----------------
-
-B) PRINTER-SPECIFIC NOTES:
-
- 1) It is strongly recommended that four color mode not be used on
- the Epson Stylus C63, C64, C65, C66, C70, C80, and CX-5200, and
- the PX-V500 and PX-V600 when printing to glossy papers, as the
- black ink is formulated differently from the color ink and does
- not adhere properly to these papers. Epson Photo Paper, Premium
- Glossy Photo Paper, Premium Luster Photo Paper, and Premium
- Semigloss Photo Paper are known to be affected. If you use the
- default settings (specifically, the Standard ink type), this will
- be handled automatically.
-
- 2) The Gutenprint driver does not in all cases offer the same set of
- resolutions offered by the printer manufacturer's drivers. There
- are a variety of reasons why that is the case:
-
- i) In some cases, we have not determined the necessary commands
- to utilize some resolutions (particularly very high
- resolutions).
-
- ii) In some cases, the advertised printer resolution may not
- match what we determine to be the maximum resolution based on
- our understanding of the printer's capabilities. Sometimes
- the advertised resolution is qualified by a statement that
- implies that the actual resolution may be different from the
- stated resolution. In some cases, we may be able to achieve
- the same number of drops per square inch by means of a
- different resolution. For example, we may determine that a
- printer that is advertised to support 5760x720 DPI in fact
- supports 2880x1440 DPI. This is the same number of droplets
- per square inch (4147200), but with a different aspect ratio
- (the ratio of the horizontal resolution to the vertical
- resolution).
-
- iii) In some cases, we offer additional resolutions not offered by
- the printer vendor. These resolutions may be either lower or
- higher than those offered by the printer vendor.
-
- We frequently offer lower resolutions than those offered by
- the printer vendor to offer a greater choice of printing
- speed. These resolutions will offer low quality but very
- fast printing speed for use where the quality is unimportant
- but speed is of the greatest importance.
-
- In some cases, we offer resolutions higher (or simply
- different) than those advertised by printer vendors. We will
- offer these options if testing determines that these
- resolutions can be used safely and we determine that these
- resolutions offer a potential benefit in quality in some
- cases.
-
- It is almost always better to have a printing resolution with
- a smaller aspect ratio (i. e. the horizontal and vertical
- resolutions are similar). For example, a resolution of
- 2880x1440 DPI is likely to yield superior results to a
- resolution of 5760x720 DPI. Therefore, in some cases we do
- not offer certain resolutions offered by the printer vendor
- (in the case of the Epson Stylus Photo R800, 5760x1440 DPI)
- because they are not likely to yield any benefit (either speed
- or quality) over another resolution that we offer (in this
- case, 2880x1440 DPI Highest Quality).
-
- Indeed, we have received reports that in some cases a lower
- resolution may actually offer improved quality over a higher
- resolution. For example, the Epson Stylus Photo 780 is
- reported to yield better quality at 1440x720 DPI Highest
- Quality than 2880x720 DPI.
-
- We periodically evaluate the list of resolutions we offer to
- decide whether to offer any additional options.
-
- 3) Many Epson printers (specifically, the Epson Stylus Color 740 and
- all newer printers) will not respond to ASCII text without a
- special "activation" sequence (specifically, this command takes
- the printers out of "packet mode"). A brand new printer, or one
- that has been connected to a Windows system, may or may not work
- in packet mode. Therefore, the common suggestion to test a
- printer port by sending plain text to it may not work for these
- printers; failure to print in this fashion is not a positive
- indication that the printer or the connection is malfunctioning.
- These printers are, however, able to print plain text *after* the
- activation sequence is sent.
-
- A suggestion would be to first verify that the printer is capable
- of returning ink levels. This may be done via
-
- escputil -i -r /dev/lp0
-
- (or whatever device your printer is connected to in place of
- /dev/lp0). If this returns status, it demonstrates that the link
- between your computer and printer is working.
-
-
-================================================================
-
-VI) LIST OF SUPPORTED OPTIONS
-
-This section details the options available in this release of
-Gutenprint 5.0. More advanced options are subject to change between
-releases, and existing options may acquire additional choices as new
-capabilities are added.
-
-These options are not supported by all printers; depending upon the
-functionality of the driver and printer, different capabilities are
-available for different printers.
-
-----------------
-
-A) BASIC PRINTER OPTIONS
-
- These options control basic printer functions.
-
- Printer Model
-
- Select the printer to use. It must always be
- supplied. When using CUPS or Foomatic, the printer
- will automatically be selected via the chosen PPD
- file; with the Print plugin for the GIMP, it is
- selected in the Setup Printer dialog.
-
- Page Size
-
- Select the paper (media) size to print to. Some
- printers support custom paper sizes, while others only
- support certain preset sizes. This must always be
- supplied.
-
- Note that this option refers to the actual size of the
- media, not the printable area. For example, selecting
- A4 refers to actual A4 paper, whatever the margins may
- be.
-
- Double-Sided Printing
-
- Otherwise known as "duplex" printing, this is offered
- for printers capable of printing on both sides of the
- page. In addition to single-sided printing, there are
- two modes of duplex operation: the page may be flipped
- over its long edge (like a book), or over the short
- edge (like a note pad; this is sometimes referred to
- as Tumble).
-
- This option is new to Gutenprint 5.0.
-
- Media Type
-
- Select the kind of paper or other media being printed
- to. This enables the printer and driver to be set up
- appropriately for the kind of paper in use. Most
- printers offer a choice of supported media types.
-
- It is important to set the Media Type to the correct
- value if possible, or if not to a closely related
- medium. The printer may need to know what kind of
- media is in use to determine how to feed the paper
- correctly; the driver needs to know in order to select
- the right output settings.
-
- Media Source
-
- Select the source of the paper or other media. This
- option is offered with printers that have multiple
- feeds, for example multiple paper bins, manual feed,
- printing directly to a CD, etc.
-
- Ink Set
-
- Select the kind of ink in use in the printer, for
- printers offering different optional inks (for
- example, ink designed for matte paper vs. ink designed
- for glossy paper).
-
- This option is new to Gutenprint 5.0.
-
- Borderless
-
- Select whether to print with borders or not, for
- printers with the capability to print to the edge of
- the page. This is otherwise known as "full bleed".
-
- This option is new to Gutenprint 5.0.
-
- Resolution
-
- Select the resolution to print at (dots per inch). In
- general, higher resolutions produce better quality, at
- the expense of additional time.
-
- As a general rule of thumb, on laser printers and
- older inkjet printers resolutions of 300 DPI or
- thereabouts provide draft quality; lower resolutions
- provide economy draft quality and cannot produce solid
- black. Resolutions of 600 or 720 DPI produce good
- quality output; higher resolutions are useful for very
- high quality image or graphic output. Newer inkjet
- printers, with smaller ink drop sizes, typically
- require higher resolutions to produce acceptable
- output; in some cases even 1440x720 DPI does not
- produce good quality.
-
- Users of Epson inkjet printers have another setting
- available: the Quality option can be used to
- indirectly control the printer resolution, among other
- things. This offers a simpler way to control output
- quality.
-
-
-----------------
-
-B) ADVANCED PRINTER OPTIONS
-
- These options control less frequently used printer options. All
- of these options are new to Gutenprint 5.0.
-
- CD Hub Size
-
- This setting may be used on printers with the
- capability to print directly to a CD. Depending upon
- your choice of media, you may be able to safely print
- all the way to the inner hole of the CD, or you may
- not be able to print any closer than the hub about an
- inch from the center.
-
- CD Horizontal Fine Adjustment
- CD Vertical Fine Adjustment
-
- These settings allow you to shift the position of the
- print while printing to a CD. If you find that your
- print is not centered on the CD surface, you may need
- to adjust these setting to compensate.
-
- Enhanced Gloss
-
- Some newer printers have a cartridge of "gloss
- enhancer", which helps solve the problem of pigment
- inks having an inconsistent lustre on glossy paper.
- Use this option to enable use of the gloss enhancer.
-
- Laminate Pattern
-
- Some dye sublimation printers are able achieve better
- durability of output by covering it with transparent
- laminate surface. This surface can be of different
- patterns: common are matte, glossy or texture.
-
-
-----------------
-
-C) SPECIALIZED PRINTER OPTIONS
-
- These options control unusual printer features. They may be
- useful in certain circumstances; generally the default settings
- will work optimally.
-
- Ink Type
-
- Select which subset of inks to use for printing. For
- example, on a photo printer with additional light cyan
- and light magenta inks, it's possible to print with
- only the standard cyan, magenta, yellow, and black
- inks.
-
- Normally there is no reason to use any setting other
- than the default. Reasons why one might want to use
- it include:
-
- 1) Some black inks are not compatible with certain
- glossy papers. If the black ink smudges on your
- paper, you may elect to use an option without black
- ink (a "composite" setting).
-
- 2) Some inks or paper/ink combinations produce color
- shifts when the light inks are used. If your
- chosen combination produces unacceptable color
- shifts or color casts, you may prefer to use the
- Four Color Standard option, which will generally
- yield more consistent color at the expense of
- "grainier" output.
-
- Printing Direction
-
- Most inkjet printers can print either unidirectionally
- (the head prints only when moving in one direction) or
- bidirectionally (the head prints when moving in both
- directions). Bidirectional printing is generally
- faster, since the printer is printing at all times
- rather than wasting much of the time returning the
- head to the starting position. On many printers,
- however, unidirectional printing produces better
- quality output than bidirectional printing.
-
- The standard setting for this option adapts to the
- printing resolution.
-
- This option is new to Gutenprint 5.0, but Gimp-Print
- 4.2 offered this option in the form of extra
- resolution choices.
-
- Interleave Method
-
- Most inkjet printers create the printed image using
- multiple overlapping passes of the print head. On
- many printers this function is performed within the
- printer itself and cannot be adjusted, but with many
- Epson inkjet printers (and some others), this is
- performed by the driver or may be specified to the
- printer. One advantage of the multiple overlapping
- passes is that it can hide small differences between
- the individual print head nozzles, which would
- otherwise be visible as banding. The different
- interleave methods are different strategies for
- for performing this overlapping; some are better at
- hiding the banding than others. They all require the
- same amount of time to print.
-
- Generally it is not necessary to adjust this; in some
- cases, depending upon your printer, you may find that
- one pattern or another performs better.
-
- On Epson Stylus Pro printers, this option allows
- specifying different overlap patterns within the
- printer. In this case, the choice of overlap pattern
- may affect both the printing time and the quality to a
- significant degree.
-
- This option is new to Gutenprint 5.0.
-
- Adjust dot size as necessary
-
- This option is provided on many Epson inkjet printers
- to allow you to use larger ink drops than those
- normally used for the resolution chosen. This may be
- necessary if you use certain kinds of media or for
- some reason wish to use much more ink (higher density)
- than the default. It should not be necessary to use
- this option.
-
- This option is new to Gutenprint 5.0.
-
-
-----------------
-
-D) BASIC OUTPUT CONTROLS
-
- Output Type
-
- This option specifies whether to print in color or
- black and white/grayscale (using only black inks).
- Black and white printing is generally faster than
- color printing, even if the item being printed is
- entirely black and white. However, printing with only
- black ink may yield a "grainy" appearance.
-
- This option was present in Gutenprint 4.2, but it
- offered an additional option of "black and white",
- which printed everything as either black or white (no
- grayscale). The Gutenprint 5.0 equivalent is to set
- Color Correction to Threshold.
-
- Color Correction
-
- This selects the choice of color correction method
- within Gutenprint. The following options are
- presently offered:
-
- * DEFAULT: Select a color correction mode appropriate
- for the document type being printed.
-
- * HIGH ACCURACY: Apply optimum color correction to the
- output to produce the best color quality. This
- corrects the hue, brightness, and saturation
- (brilliance of color). This is the normal setting
- to use for printing photographs or graphics if you
- are not using any external color management.
-
- * BRIGHT COLORS: Apply color correction to the output,
- but generate more brilliant colors in some cases.
-
- * CORRECT HUE ONLY: Apply color correction to the
- output, but correct only the hue. This option does
- not correct brightness and saturation.
-
- * UNCORRECTED: Do not apply any color correction to
- the output beyond generating linear output. This is
- the best setting to use when utilizing external
- color management; the high accuracy modes employ
- correction algorithms that may not work well with
- color management.
-
- Note that if you use color management you should use
- profiles created with Gutenprint and with the exact
- settings that you plan to print with. Profiles
- provided by the printer vendor are calibrated for
- the vendor's driver, which may not be identical to
- Gutenprint's calibration. In addition, profiles
- created using Gimp-Print 4.2 or earlier will
- generally not perform well with Gutenprint 5.0.
-
- * DESATURATED: Print in pure grayscale, but using
- color inks. The result is somewhat different from
- printing in black and white using the Output Type
- option -- the driver may use color ink, which
- generates smoother output and may yield better
- results on many papers.
-
- * THRESHOLD: Convert all colors to fully on or fully
- off, eliminating all gradual tonal gradations. The
- result is that the output will consist of all very
- pure colors.
-
- * DENSITY: Correct only the amount of ink ("density"),
- otherwise performing no correction at all, even for
- linearity. Prints made with this option will
- usually be very dark if no other color management is
- used. This may be useful if you are printing in 16
- bit precision or are using your own linearization
- curves.
-
- * RAW: Perform no correction at all, even for
- density. Prints made with this option will be very
- dark and may bleed (or even puddle!) ink if not used
- with external color management and linearization.
- This option may be useful if you are using external
- color management and linearization to get extremely
- saturated dark colors by using more ink in
- individual channels. It should be used with extreme
- caution, as it is very easy to damage the printer if
- you are not careful.
-
- * PRE-DITHERED: Interpret each pixel as the actual
- size of each drop to be printed. Legal values of
- the drop sizes differ between printers; all printers
- support 0 (no droplet) and 1 (the largest droplet).
- Some printers support four levels (0, 1, 2, and 3).
-
- This option is new to Gutenprint 5.0, but its function
- was partially encompassed by the Image Type option.
-
-
- Image Type
-
- Specify the option that best describes your print job.
- Your choice here will affect the processing of the
- print job. Currently available settings are:
-
- * TEXT: Optimize the output for printing black text
- with no graphics. This option results in crisp
- output and is very fast, but will yield very poor
- results with any color or grayscale graphics.
-
- * GRAPHICS: Optimize the output for printing color
- graphics. This option will generate smooth, bright
- output.
-
- * MIXED TEXT AND GRAPHICS: Optimize the output for
- printing a mixture of text and graphics.
-
- * PHOTOGRAPH: Optimize the output for printing
- photographs. This option will generate smooth
- tones and high quality colors, but will be slower
- than the other options.
-
- * LINE ART: Optimize the output for printing black and
- white line art with intricate detail.
-
- * MANUAL CONTROL: Do not bias the output at all; use
- only the settings specified by the user.
-
- This option was present in Gimp-Print 4.2, but with
- fewer choices and more restrictions on their use. Its
- functioned more like the Color Correction option in
- Gutenprint 5.0.
-
-
- Print Quality
-
- Specify the desired output quality using convenient
- presets. Where this option is available, Gutenprint
- will automatically adjust the printing resolution and
- other options to generate the desired quality.
- Settings chosen with this option may be overridden by
- explicitly setting other settings, such as resolution.
- Not all printers offer all of these options.
- Currently available settings, in increasing order of
- quality, include:
-
- * FAST ECONOMY: Use the fastest printing mode
- available on the printer to print with a minimum
- amount of ink. This option will produce very washed
- out colors and grays, and will typically be
- extremely grainy and streaky.
-
- * ECONOMY: Print very rapidly with a reduced amount of
- ink. This option will produce washed out colors and
- grays and will typically be quite grainy and
- streaky.
-
- * DRAFT: Print low quality draft output quickly. This
- option will typically produce acceptable colors with
- some amount of grain on plain paper, but will
- typically produce washed out and grainy output on
- high quality papers. On some printers this may
- employ a special draft mode to print especially
- quickly at the expense of color fidelity.
-
- * STANDARD: Print at a normal quality level for text
- or text/graphics on plain paper or basic inkjet
- paper. This option will typically produce
- acceptable colors, but on high quality papers the
- output may be grainy or somewhat washed out. This
- option may also be useful for printing draft copies
- of photographs on coated inkjet paper.
-
- * HIGH: Print final copies of text or text/graphics on
- plain paper or inkjet paper. This option will
- typically produce good color quality, but the
- quality may not be optimal for photographs on glossy
- paper. This option may also be useful for printing
- draft copies of photographs on glossy paper.
-
- * PHOTO: Print photographs on glossy paper or very
- high quality text, text/graphics, or line art on
- high quality paper. In the latter application this
- will produce output close to laser printer quality.
- On the highest quality premium papers the result may
- still be a bit grainy.
-
- * SUPER PHOTO: Print photographs on glossy paper with
- very high quality. This will generally yield very
- good results on high quality premium paper but may
- be overkill on other papers. This option is only
- offered on printers capable of producing very high
- quality output rivaling traditional photographic
- printing. This option may also be appropriate for
- very intricate line art, where the required
- resolution may exceed the capabilities of laser
- printers.
-
- * ULTRA PHOTO: Print photographs on premium papers
- with extremely high quality. This option is only
- offered on printers capable of producing extremely
- high quality output matching or exceeding
- traditional photographic printing.
-
- * BEST: Print with the best quality available on the
- printer for the application chosen. This may be
- equivalent to one of the other settings; on a very
- few printers the resolution may exceed that of Ultra
- Photo mode.
-
- * MANUAL CONTROL: Do not adjust the settings at all;
- use only the settings specified by the user.
-
- This option is new to Gutenprint 5.0.
-
-
-----------------
-
-E) BASIC OUTPUT ADJUSTMENTS
-
- Saturation
-
- This option controls the vividness of the output
- color; higher values produce more vivid colors. Very
- low values produce muted colors; setting this to zero
- produces gray.
-
- Contrast
-
- This controls the contrast of the output. Lower
- values produce less tonal range in the midtones
- (lighter colors become darker, and darker colors
- become lighter), which may allow for more definition
- in the highlights and shadows. Higher values do the
- opposite: lighter colors become even lighter, while
- darker colors become even darker.
-
- This option behaves differently from its equivalent in
- Gimp-Print 4.2. In Gimp-Print 4.2, setting contrast
- less than 1 changed the white point and black point:
- white became light gray and black became dark gray.
- In Gutenprint 5.0 this control changes the shape of
- the curve, but the black and white points remain the
- same. The Linear Contrast Adjustment option described
- below restores the Gimp-Print 4.2 behavior.
-
- Brightness
-
- This control adjusts the general brightness of the
- print; higher values produce generally lighter output,
- while lower values produce generally darker output.
- White and black are not changed; colors also retain
- their hue and saturation.
-
- This option behaves differently from its equivalent in
- Gimp-Print 4.2. In Gimp-Print 4.2, setting brightness
- greater than 1 caused black to print as gray, while
- setting brightness to less than 1 caused white to
- print as gray. In Gutenprint 5.0 this control changes
- the shape of the curve, but the black and white points
- remain the same.
-
-
-----------------
-
-F) ADVANCED OUTPUT ADJUSTMENTS
-
- These controls adjust more specialized settings.
-
- Dither Algorithm
-
- Since inkjet printers have a limited set of ink colors
- (normally cyan, magenta, yellow, and black), most
- colors have to be produced by mixing the available
- inks. This is done by printing patterns of very small
- dots, fooling the eye into seeing many different
- shades. This process is called "dithering"; several
- different patterns are available, with trade-offs
- between speed and quality. The following dither
- algorithms are currently available. If no algorithm
- is selected, the driver chooses an appropriate one
- based on other option settings. The following
- algorithms are currently available, generally in
- increasing order of quality.
-
- * VERY FAST: This algorithm produces very rough,
- patterned output, but is extremely fast. This
- generally yields poor results on modern inkjet
- printers, particularly models that offer multiple
- drop sizes, but it can yield very good results on
- laser printers. It is a good choice for printing
- text or line art where no grayscale or color is
- used, and also works very well when Threshold color
- correction is used.
-
- * FAST: This algorithm also produces output with very
- strong diagonal patterns, and is also quite fast.
- It produces somewhat better results on modern inkjet
- printers that offer multiple drop sizes, but offers
- no advantages on laser printers or old (generally
- pre-1999) inkjet printers.
-
- * ORDERED: This algorithm produces much smoother
- output than Fast or Very Fast. It is somewhat
- slower than those algorithms. It utilizes a fixed
- pattern that is generally free of artifacts, but it
- has some noise (roughness of texture) that may be
- objectionable with smooth-toned images. It is an
- excellent choice for printing draft copies of
- business graphics or photographs (charts, etc.) due
- to its lack of artifacts.
-
- * ADAPTIVE HYBRID: This algorithm produces slightly
- smoother output than Ordered dithering, at some cost
- in performance. It uses a fixed pattern in
- highlights to avoid artifacts, and error diffusion
- at higher densities to reduce noise. It is an
- excellent choice for printing business graphics due
- to its lack of artifacts and smooth texture in
- darker tones.
-
- * EVEN TONE: This relatively new algorithm yields
- excellent smoothness in all tones (light, midtone,
- and shadow), but is considerably slower than most of
- the other algorithms. It is somewhat prone to
- artifacts, including "tearing", at sharp boundaries.
- This algorithm is well-suited for printing
- photographs, but is not as suitable for printing
- solid-tone graphics.
-
- * HYBRID EVEN TONE: This algorithm combines Even Tone
- and Ordered dithering to yield smooth results with
- fewer artifacts than Even Tone dithering, but is
- even slower than standard Even Tone. It uses the
- fixed pattern of Ordered dithering to break up the
- artifacts of Even Tone dithering. The result is not
- quite as smooth as pure Even Tone, but the reduction
- of artifacts makes this an excellent choice for
- photographs or photographs mixed with other
- graphics.
-
- * PREDITHERED: This is used in combination with
- dithering performed outside of Gutenprint or with
- printers that perform their own dithering. It
- assumes that the output is already dithered and
- generates the appropriate drops based only on the
- values provided.
-
- Linear Contrast Adjustment
-
- The standard contrast control does not adjust the
- black and white points of the output; black in the
- input becomes black in the output, for example. The
- result is that if contrast is reduced below 1, the
- contrast in the highlights and shadows is actually
- increased to keep the same total tonal range.
-
- Gimp-Print 4.2 used a different kind of contrast
- control. In Gimp-Print 4.2, reducing the contrast
- reduced the contrast throughout the tonal range,
- resulting in white being printed as a light gray and
- black as a dark gray (reducing the contrast all the
- way to zero resulted in a uniform gray). If contrast
- was increased, the contrast was stretched until the
- output reached either black or white; anything lighter
- always printed as white and anything darker as black.
-
- Turning this control on selects the old Gimp-Print 4.2
- behavior. This control is normally turned off.
-
-
-----------------
-
-G) OUTPUT DENSITY (INK QUANTITY) CONTROLS
-
- These controls adjust the amount of ink printed on the page.
- These controls may be used to darken a solid, pure black, or
- eliminate puddling (wet ink left on the paper that does not dry in
- the printer) if needed. They may also be useful for adjusting the
- behavior of non-standard inks. They should not be used to lighten
- or darken the print if the black level is correct.
-
- These controls are adjustments -- they adjust the amount of ink
- relative to the amount selected by the driver for the paper and
- resolution chosen.
-
- Density Value
-
- This control adjusts the total amount of ink used in
- all channels (ink colors).
-
- Black Density Value
- Blue Density Value
- Cyan Density Value
- Magenta Density Value
- Yellow Density Value
- Red Density Value
-
- These controls adjust the amount of ink used by each
- channel separately. They may be used to correct the
- amount of ink if needed to strengthen or weaken
- particular colors (e. g. if yellow is too strong or
- too weak). They should not be used to correct gray
- balance (to produce neutral gray) -- the gray balance
- controls described below should be used for that
- purpose.
-
- These options are new to Gutenprint 5.0.
-
- Ink Limit Value
-
- This control adjusts the maximum amount of ink that
- the driver will use to print with. This may be used
- if you want to use large amounts of particular inks to
- achieve saturated dark colors, without using excessive
- ink overall that will result in ink puddling or
- spilling within the printer. This control should be
- used only by people very experienced in inkjet
- printing.
-
- This option is new to Gutenprint 5.0.
-
-
-----------------
-
-H) GRAY BALANCE CONTROLS
-
- These controls adjust the gray balance by changing the amount of
- each color of ink used to produce gray. For example, if gray
- prints somewhat greenish, it can be corrected by increasing the
- magenta balance. These options are new to Gutenprint 5.0.
-
- Magenta Balance Value
- Yellow Balance Value
- Cyan Balance Value
-
-
-----------------
-
-I) OUTPUT GAMMA CONTROLS
-
- These controls permit adjusting the gamma (exponent) of the
- transfer curves of the individual channels. On most printers,
- using a linear ink scale (that is, the amount of ink is directly
- proportional to the input value) will produce very dark
- highlights, as even quite small amounts of ink produce very strong
- colors or gray. Therefore, the driver uses less ink to produce
- lighter colors. This does not affect the darkest tones.
-
- Setting these controls to larger values results in lighter
- highlights and midtones and increase contrast in the dark tones,
- while lower values result in darker midtones and highlights with
- reduced dark tone contrast. These controls are adjustments --
- they adjust the gamma relative to the gamma chosen by the driver
- by multiplying them together. For example, if the driver uses a
- gamma value of 2.0 for a particular printer, and you specify a
- gamma of 0.75, the actual gamma used to print will be 1.5.
-
- Composite Gamma Value
-
- This control adjusts the gamma of all available ink
- channels when printing in color.
-
- This option is equivalent to the Gamma option in
- Gimp-Print 4.2.
-
- Black Gamma Value
-
- This control adjusts the gamma of the black channel
- when printing in grayscale.
-
- This option is new to Gutenprint 5.0.
-
- Cyan Gamma Value
- Magenta Gamma Value
- Yellow Gamma Value
-
- These controls adjust the gamma of individual channels
- when printing on printers that use cyan, magenta, and
- yellow inks (all inkjet printers use CMY inks). These
- gamma values are multiplied by the composite gamma
- value and the gamma chosen by the driver.
-
- Note that the black gamma value is not used when
- printing in color. That is because the amount of gray
- is computed after the gamma transformation has been
- applied to each channel, and the black channel is
- synthesized from this value. The GCR Transition Value
- serves as a gamma value for the black channel. In
- addition, there are no gamma values for the special
- channels for printers that offer additional inks (such
- as red and blue) for similar reasons.
-
- These controls are equivalent to the Cyan, Magenta,
- and Yellow controls in Gimp-Print 4.2.
-
- Red Gamma Value
- Green Gamma Value
- Blue Gamma Value
-
- These controls adjust the gamma of individual channels
- when printing on printers that use red, green, and
- blue inks (Postscript printers and many dye
- sublimation printers use red, green, and blue colors).
- These gamma values are multiplied by the composite
- gamma value and the gamma chosen by the driver.
-
- These options are new to Gutenprint 5.0; Gimp-Print
- 4.2 referred to them as Cyan, Magenta, and Yellow even
- if the output was RGB.
-
-
-----------------
-
-J) GRAY GENERATION CONTROLS
-
- These controls adjust the conversion of gray into black ink and
- composite (CMY) components. When printing in color, light grays
- are often printed using composite inks rather than black ink to
- reduce the speckling effect of dark black dots, while dark grays
- and black are usually printed using black ink to achieve a darker
- black. With some ink and paper combinations it is necessary to
- use a mixture of black and composite components to achieve maximum
- density and in some cases to achieve neutral grays (some pigment
- black inks are actually brown).
-
- The effect of using too much or too little black ink varies.
- Typically if too much black ink is used light colors and grays
- will have noticeable speckling from the black drops, while if too
- little black ink is used the midtones and dark tones will be
- washed out and in some cases too much ink will be used leading to
- puddles on the page. In some cases very large amounts of
- composite ink cause color shifts (darker grays are not neutral).
- Epson Premium Glossy Photo Paper seems to be particularly prone to
- this problem, particularly with dye inks.
-
- In general, lower-quality papers require more black ink (composite
- inks generally cannot create very dark tones), while higher
- quality papers require less black ink (the composite inks can
- create much darker grays, and the black dots appear much sharper).
-
- Setting these controls effectively requires a good understanding
- of gray generation and a fair amount of experimentation. Normally
- it's only necessary to set the paper type correctly to get good
- results.
-
- These options are all new to Gutenprint 5.0.
-
- GCR Lower Bound Value
-
- This control specifies the darkest shade of gray at
- which no black ink will be used (i. e. any lighter
- gray component will be printed using only composite
- inks). Setting this control to zero means that some
- amount of black ink will always be used; setting it to
- 1 means that no black ink will ever be used.
-
- GCR Upper Bound Value
-
- This control specifies the lightest shade of gray at
- which no composite CMY ink will be used (i. e. this
- level of gray and higher will be printed using only
- black ink). This control should never be set any
- lower than the GCR Lower Bound Value. Setting this
- control to zero means that only black ink is used to
- print any gray value; setting this control to a value
- greater than one means that some composite ink will be
- used even when printing black. The upper limit for
- this control is 5 (in which case black will be printed
- with no more than 20% black ink).
-
- If you use an ink set requiring use of color inks to
- produce neutral grayscale, you should set the GCR
- Lower Bound Value to zero or a value very close to
- zero and the GCR Upper Bound Value should be greater
- than 1, along with a GCR Transition Value (below) of
- 1. This will ensure that the proportion of black and
- color inks will be close to constant throughout the
- gray range. With this kind of inkset, it's often
- possible to produce cool or warm toned grayscale
- prints by selecting Desaturated color correction and
- adjusting the GCR Upper Bound Value appropriately.
- For example, if the black ink has a brown (warm) cast,
- increasing the GCR Upper Bound Value will yield a
- cooler tone (less black ink) while decreasing it will
- yield a warmer tone (more black ink).
-
- GCR Transition Value
-
- This control specifies the gamma of the GCR transition
- curve. Setting this control to a smaller value
- results in less black ink being used in the lighter
- portion of the transition region. This control is
- useful if the black ink is much darker than the
- composite inks in order to produce a smoother
- transition.
-
- GCR Curve
-
- This control (only available through the Print plugin
- for the GIMP or other Gutenprint-based applications
- that provide curve capability) allows you to specify
- the conversion curve from gray to black/composite
- precisely. The horizontal axis of this curve
- represents the gray level (between 0, or no gray at
- all, and 1, or pure black); the vertical axis
- represents the fraction of gray that is converted to
- black (0 means only composite inks, and 1 means only
- black ink).
-
-
-----------------
-
-K) OUTPUT LINEARIZATION CURVES (GIMP Plugin Only)
-
- These controls permit adjusting the transfer (linearization)
- curves of each channel precisely. They are only available through
- the Print plugin for the GIMP or other Gutenprint-based
- applications that provide curve capability. All of these controls
- are considered to be for very advanced use only. These options
- are all new to Gutenprint 5.0.
-
- Black Curve
- Blue Curve
- Cyan Curve
- Magenta Curve
- Yellow Curve
- Red Curve
- Green Curve
-
-
-----------------
-
-L) DETAILED COLOR CORRECTION CURVES (GIMP Plugin Only)
-
- These controls permit adjusting precise characteristics of color
- generation/correction. They are only available through the Print
- plugin for the GIMP or other Gutenprint-based applications that
- provide curve capability. All of these controls are considered to
- be for very advanced use only.
-
- The horizontal axis of all of these curves represents the hue of
- the output. Hue is measured as an angle, where 0 and 360 degrees
- represent cyan (or red, if the output inks are RGB).
- Conventionally, these angles are represented as a number between 0
- and 6 (each full number in this scale represents 60 degrees). The
- specific hue angles for CMY and RGB outputs are as follows:
-
- \ Ink Type
- Angle \ RGB CMY
- ----- \ --- ---
- 0 | Red Cyan
- 1 | Yellow Blue
- 2 | Green Magenta
- 3 | Cyan Red
- 4 | Blue Yellow
- 5 | Magenta Green
- 6 | Red Cyan
-
- These options are all new to Gutenprint 5.0.
-
- Hue Adjustment Curve
- Luminosity Adjustment Curve
- Saturation Adjustment Curve
-
- These controls adjust the color correction in High
- Accuracy, Bright Colors, and Correct Hue Only color
- correction modes. These color correction modes work
- by adjusting the hue, saturation, and luminosity (HSL)
- of the output inks to achieve a more accurate color
- than the color created by simply converting the red,
- green, and blue inputs to cyan, magenta, and yellow
- (or red, green, and blue) inks. Note that in this
- printing context luminosity represents darkness
- (amount of light subtracted) rather than brightness.
-
- The saturation and hue adjustments are first applied.
- The luminosity correction operates on only the color
- component of the output. Before this correction is
- applied, any gray value is removed, and added back
- after the correction is completed.
-
- The vertical axis of the Hue Adjustment Curve
- represents an angular difference that is added to the
- base hue value to generate the desired output. For
- example, if the blue output is purple (too close to
- magenta), adding a negative value to that range of the
- output will bring the blue value more toward cyan
- (less magenta).
-
- The vertical axis of the Saturation Adjustment Curve
- represents an amount by which the saturation is
- multiplied. At any given hue point it may take on any
- value between 0 (eliminate all color saturation, which
- is equivalent to converting to pure gray) and 4
- (dramatically boost the saturation). Therefore, this
- adjustment may be used to tone down excessively
- brilliant colors (e. g. if the reds are overly
- brilliant) or brighten up dull colors (e. g. if the
- greens are somewhat dull). This control has no effect
- if Correct Hue Only is used. If the saturation value
- is greater than 1, the effect differs depending upon
- whether High Accuracy or Bright Colors mode is
- selected: if Bright Colors is selected, the saturation
- is simply multiplied by the desired value and then set
- to 1 if it would exceed unity. If High Accuracy mode
- is selected, the amount of saturation boost is
- decreased if the starting saturation is high.
-
- The vertical axis of the Luminosity Adjustment Curve
- represents an amount by which the luminosity is
- multiplied. At any given hue point it may take on any
- value between 0 (remove the color component
- altogether) and 1 (leave it as is). Therefore, the
- function of the Luminosity Adjustment Curve is to
- lighten excessively dark colors rather than to darken
- light colors. This control has no effect if Correct
- Hue Only mode is used.
-
- Blue Map
- Cyan Map
- Magenta Map
- Yellow Map
- Red Map
-
- These curves control how the auxiliary red and blue
- inks are used on the Epson Stylus Photo R800, Stylus
- Photo R1800, and PictureMate family of printers.
- These printers use auxiliary inks to achieve more
- brilliance in the red and blue. Other printers in the
- future may use other auxiliary channels, which will be
- made available in similar fashion.
-
- The vertical axis of each of these controls specifies
- the amount of each ink that should be used to print
- colors of that hue. These curves are used only to
- generate color; any gray component is removed prior to
- the color generation and added back later. For
- example, it is possible to specify that a certain
- shade of purple is printed using .2 red ink, .6
- magenta ink, and .5 blue ink (hypothetically).
-
-
-----------------
-
-M) SPECIALIZED OUTPUT CONTROLS
-
- These controls are used to modify the output in very
- printer-specific ways. These options are all new to Gutenprint
- 5.0.
-
- Gloss Level Value
-
- This control is provided on printers such as the Epson
- Stylus Photo R800 and R1800 that offer a special gloss
- enhancer to produce an even degree of gloss on glossy
- papers regardless of the amount of ink used. On
- certain glossy papers, areas with high ink coverage
- are a lot glossier than areas with little ink coverage
- (highlights); the gloss enhancer is basically a
- transparent ink that increases the gloss of these
- areas. This control specifies the desired total
- amount of ink to be printed, including both the normal
- color and black inks and the gloss enhancer. If the
- amount of normal inks is less than this amount, gloss
- enhancer is used to increase the total amount of ink
- used.
-
-
-----------------
-
-N) TRANSITION CONTROLS
-
- These controls adjust the level at which light inks (such as the
- light cyan and magenta inks used on many "photo printers") are
- used in place of the dark inks. The light inks are used to
- produce a smoother texture (less speckling); the light cyan
- droplets, for example, are individually much less visible than the
- normal dark cyan droplets.
-
- The ink substitution works by replacing a certain amount of ink by
- a mixture of the light and dark inks. For example, the dark cyan
- ink may be about 3 times as dark as the light cyan ink, so in
- light areas the cyan may be replaced by 3 times as much light
- cyan. However, this only works up to a certain point; beyond that
- point, adding more light ink does not significantly increase the
- darkness of the ink. These transition values adjust the limits at
- which the ink substitution is done; the lower these limits are
- set, the lighter the output at which dark ink is introduced.
- Setting these values lower will generally yield more accurate
- midtone colors at the expense of more speckling in the light
- midtones and highlights. Generally these values need to be lower
- on low-quality paper than on high quality glossy paper.
-
- These options are all new to Gutenprint 5.0.
-
- Dark Yellow Transition Value
- Light Gray Transition Value
- Mid Gray Transition Value
- Dark Gray Transition Value
- Gray Transition Value
- Light Cyan Transition Value
- Light Magenta Transition Value
- Light Yellow Transition Value
-
-
-----------------
-
-O) FOOMATIC-ONLY OPTIONS
-
- This control is available only when using the Foomatic interface.
- It provides a collection of presets appropriate for various
- printing tasks. It is similar in concept to (and provided the
- inspiration for) the Print Quality and Image Type options provided
- in Gutenprint.
-
- Printout Mode
diff --git a/README b/README
index d1ed836..d0cf962 100644
--- a/README
+++ b/README
@@ -1,125 +1,356 @@
-Welcome to Gutenprint 5.0.0-rc3! Please read these release notes
-carefully.
-
-INTRODUCTION
-
- This is Gutenprint version 5.0.0 release candidate 3, a release
- candidate of Gutenprint 5.0. Gutenprint, formerly named
- Gimp-Print, is a suite of printer drivers that may be used with
- most common UNIX print spooling systems, including CUPS, lpr,
- LPRng, or others. These drivers provide high quality printing for
- UNIX (including Macintosh OS X 10.2 and newer) and Linux systems
- in many cases equal to or better than proprietary vendor-supplied
- drivers, and can be used for many of the most demanding printing
- tasks. A complete list of supported printers may be found in the
- NEWS file. Gutenprint also includes a plug-in for the GIMP image
- editor.
-
- Gutenprint, formerly named Gimp-Print, has been renamed in order
- to clearly distinguish it from the GIMP. While this package
- started out as the Print plugin for the GIMP, it has expanded into
- a collection of general purpose printer drivers, and the Print
- plugin for the GIMP is now only a small (but important) piece of
- the package. Furthermore, the name Gutenprint recognizes Johannes
- Gutenberg, the inventor of the movable type printing press.
- Finally, the word "guten" means "good" in German.
-
- Please read this README, and the NEWS file carefully! Many things
- have changed from previous releases. The package is quite
- different in many ways from Gimp-Print 4.2, and you should read
- these instructions carefully. In addition, the NEWS file contains
- specific software requirements.
-
- A user's manual exists in doc/users_guide; it is normally
- installed in PDF and HTML form in /usr/local/share/gutenprint/doc.
- This manual covers setup and use of the GIMP Print plug-in and the
- CUPS driver.
-
- We urge all distributors of this package to read the PACKAGING
- section below and KNOWN BUILD ISSUES section in the release notes.
-
-
-BASIC INSTALLATION
+Welcome to Gutenprint 5.0.0! Please read these notes carefully.
+
+================================================================
+
+I) INTRODUCTION
+
+ This is Gutenprint version 5.0.0, the first stable release of
+ Gutenprint 5.0. Gutenprint, formerly named Gimp-Print, is a suite
+ of printer drivers that may be used with most common UNIX print
+ spooling systems, including CUPS, lpr, LPRng, or others. These
+ drivers provide high quality printing for UNIX (including
+ Macintosh OS X 10.2 and newer) and Linux systems in many cases
+ equal to or better than proprietary vendor-supplied drivers.
+ Gutenprint also includes an enhanced print plug-in for the GIMP
+ image editor, replacing the Gimp-Print 4.2-based plugin supplied
+ with GIMP 1.2, 2.0, and 2.2, and offering an alternative with
+ additional capabilities to the GtkPrint-based plugin supplied with
+ GIMP 2.4 and beyond.
+
+ Gutenprint has been renamed in order to clearly distinguish it
+ from the GIMP. While this package started out as the Print plugin
+ for the GIMP, it has expanded into a collection of general purpose
+ printer drivers, and the enhanced Print plugin for the GIMP is now
+ only a small part of the package. Furthermore, the name
+ Gutenprint recognizes Johannes Gutenberg, the inventor of the
+ movable type printing press. Finally, the word "guten" means
+ "good" in German.
+
+ Please read the user's manual (in ODF format as
+ doc/gutenprint-users-manual.odt or PDF format as
+ doc/gutenprint-users-manual.pdf) carefully, as it covers much more
+ information than this README file. The user's manual contains a
+ complete list of supported printers. In addition, please read the
+ release notes (NEWS), as it has information on the latest changes.
+ This package has changed extensively since Gimp-Print 4.2.
+
+ Gutenprint supports only the printer part of multi-function
+ devices (devices that typically include scanning, copying, and fax
+ capabilities).
+
+ We recommend that all users who wish to use this package for
+ general purpose printing use either CUPS or, if they use another
+ printing system or no spooler at all, use Foomatic with the
+ Ghostscript driver (both described below), rather than integrating
+ the Ghostscript driver with self-made scripts or even manually
+ typing in Ghostscript command lines. It is much simpler to manage
+ with CUPS or Foomatic and its PPDs. CUPS provides an excellent
+ web-based interface for easy printer administration, and all
+ CUPS-enabled applications (OpenOffice.org, all KDE apps, etc.) and
+ printing dialogs (kprinter, xpp, etc.) show all the options in
+ easy to use GUIs. Please visit http://www.cups.org/ for
+ information on downloading and installing CUPS.
+
+
+================================================================
+
+II) INSTALLATION
+
+ This section is provided for people installing the package from
+ source. If you are installing from a pre-compiled package (such
+ as the Macintosh OS X package, or a package provided by your
+ distribution vendor), you may skip this section.
+
+ Installing packages from source requires some level of system
+ administration skills along with superuser privileges. Superuser
+ privilege allows you to perform actions that may be damaging to
+ your system. If you are not comfortable with the material
+ discussed here and in the release notes, we recommend that you not
+ attempt to install this package from source.
+
+ Before beginning, please read the release notes carefully for any
+ updates.
+
+----------------
+
+A) OVERVIEW
Gutenprint includes the following primary components:
- - The core driver package
+ - The core driver library (required for everything else)
- A CUPS (Common UNIX Printing System) driver
- - A Print plug-in for the GIMP
+ - An enhanced Print plug-in for the GIMP
- Support for the Foomatic spooler configuration system
- A Ghostscript driver using the IJS plugin facility
- - A utility to administer and maintain Epson printers
-
- The core driver package is always built. Directions for building
- the other components are listed below.
-
- Please check our web site at http://gimp-print.sourceforge.net for
- details about what is and is not supported.
+ - A command-line utility to administer and maintain Epson
+ printers
- Please report any problems to gimp-print-devel@sourceforge.net.
+ This package requires the use of GNU Make to compile. On systems
+ with both GNU make and another make installed, GNU make may be
+ named `gmake' or `gnumake'. BSD users in particular must take
+ care to use 'gmake'.
- In general, to build Gutenprint, you run the following commands:
+ The general procedure to build Gutenprint is as follows:
./configure [options]
make
make install
- If you do not have the GIMP installed (or if you have only the
- user package installed, and not the development package that most
- distributions include separately), the attempt to run configure
- will fail. To build other components (such as the Ghostscript or
- CUPS drivers) without the GIMP being present, you must use the
- --without-gimp option to configure.
-
- By default dynamically loadable modules (plug-ins) will be built,
- and loaded at run-time if your operating system supports it. If
- you experience problems, --with-modules=dlopen or
- --with-modules=ltdl may be used to select the module loading
- method (dlopen is the default, but GNU libltdl is more portable),
- or --with-modules=static or --without-modules disables them.
-
- Note: This package requires the use of GNU Make to compile. On
- systems with both GNU make and another make installed, GNU make
- may be named `gmake' or `gnumake'. BSD users in particular will
- need to use 'gmake'.
-
-
-CUPS
+ The "configure" script, which must be run before doing anything
+ else, controls which of these components are built along with any
+ options desired. This script determines what software is
+ installed on your system and what components will be compatible
+ with it, and prepares the package to be built and installed. If
+ the script emits any warnings or errors, please be certain that
+ you understand them before proceeding.
+
+ After the configure script has completed its work, it will print
+ a summary of its choices. Please ensure that it is correct before
+ proceeding. The summary looks like this:
+
+ Configuration Summary:
+ ------------- --------
+
+ If you have any problems, please report the information below to
+ gimp-print-devel@lists.sourceforge.net
+
+ ================================================================
+ Release: gutenprint 5.0.0 generated on 22 Jul 2006
+
+ Features:
+ Build CUPS: yes, installing in /usr
+ Build CUPS PPD files: yes
+ Build translated CUPS PPD files: no
+ Build simplified CUPS PPD files: no
+ Generate PS level 3 CUPS PPD files: yes
+ Install CUPS PPD files at top level: no
+ Build genppd statically: yes
+ Build Ghostscript IJS driver: yes
+ Build Foomatic data: yes
+ Build Foomatic 3.x data: yes
+ Build enhanced Print plugin for the GIMP: yes
+ Build GIMP 1.2 plugin: yes
+ Build GIMP 2.x plugin: yes
+ GIMP 2.x plugin will be named: print
+ Install plugin(s) in home directory: no
+ Build EPSON Stylus utility: yes
+ Build test programs: yes
+ Build testpattern generator: yes
+
+ Installation summary:
+ Installation prefix: /usr/local
+ Data directory: /usr/local/share/gutenprint
+ Library directory: /usr/local/lib/gutenprint
+ XML data directory: /usr/local/share/gutenprint/5.0.0/xml
+ Module directory: /usr/local/lib/gutenprint/5.0.0/modules
+ Install sample images: yes
+
+ General configuration:
+ Compiler options: -g -O2 -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -finline-limit=1048576 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls
+ Build static libraries: yes
+ Build shared libraries: no
+ Maintainer mode: yes
+ Generate profiling information: no
+ Generate debugging symbols: no
+ Use modules: static
+ Use readline libraries: yes, extra arguments: -lncurses
+ ================================================================
+
+
+ The CUPS, GIMP, Foomatic, and Ghostscript components require that
+ the appropriate packages be installed on your system. Many
+ distribution vendors separate packages into runtime and
+ development packages. The development packages are required in
+ order to successfully compile Gutenprint. In many cases the
+ configure script cannot detect whether these development packages
+ are installed, in which case you will get an error during
+ compilation. Also note that it is necessary for the versions of
+ the development packages to match exactly the versions of the
+ runtime packages they are related to.
+
+----------------
+
+B) CORE DRIVER LIBRARY
+
+ The core driver library, which is always built, contains all of
+ the printer drivers comprising the Gutenprint package. When the
+ package is built, it consists of a core library (libgutenprint), a
+ set of XML files, and depending upon the options selected,
+ additional libraries containing the drivers for each family of
+ printers.
+
+ By default dynamically loadable modules (plug-ins) will be built
+ for the family drivers, and loaded at run-time if your operating
+ system supports it. If you experience problems,
+ --with-modules=dlopen or --with-modules=ltdl may be used to select
+ the module loading method (dlopen is the default, but GNU libltdl
+ is more portable), or --with-modules=static or --without-modules
+ disables them. If you wish to compile Gutenprint entirely
+ statically (with no use of shared libraries), you may use the
+ option --disable-shared.
+
+ NOTES TO PACKAGERS:
+
+ * You may wish to create a development package containing header
+ files and linkable libraries separate from the runtime package.
+ There are a few third party applications that link against
+ Gutenprint.
+
+ * Gutenprint permits installation of Gimp-Print 4.2 alongside
+ Gutenprint 5.0, and in the future will permit concurrent
+ installation of different stable versions of Gutenprint with
+ different minor version numbers. Gutenprint uses the old-style
+ kernel numbering system, whereby even numbered minor versions
+ are stable (4.2, 5.0, 5.2) and odd numbered minor versions are
+ development (4.3, 5.1). Therefore, you should consider allowing
+ Gutenprint 5.0 and Gimp-Print 4.2 to be installed concurrently.
+
+
+----------------
+
+B) CUPS
Gutenprint may be used as a driver under CUPS (Common UNIX
Printing System), if your system uses that spooler. Full
description of CUPS is beyond the scope of this README file; full
information may be found at http://www.cups.org. Gutenprint 5.0
requires CUPS 1.1.9 or higher. We recommend use of 1.1.15 or
- above; that release of CUPS fixes some important bugs.
-
- This package includes a CUPS driver that may be built, allowing
- use of this software for general printing purposes. Gutenprint
- will normally detect the presence of CUPS; if it doesn't on your
- system, you must run:
-
- ./configure --with-cups
- make
- make install
- cups-genppdupdate.5.0 (OPTIONAL)
- /etc/init.d/cups restart
-
- If you have installed CUPS as a precompiled package (e. g. it's
- the standard printing system that your distribution uses), you may
- need to install a separate development package (typically called
- "cups-devel" or "cups-developer"). You will need to do this if
- configure completes correctly, but "make" fails when building in
- src/cups. The CUPS package typically installed by most
- distributions only contains the components needed to run CUPS, not
- those required to build additional CUPS drivers.
-
- The last command (/etc/init.d/cups restart) varies with your
- operating system; the purpose is to restart the CUPS server
- (daemon) so that it sees the newly installed driver. It is
- typically /etc/init.d/cups, /etc/software/init.d/cups,
- /etc/rc.d/cups, or even /etc/rc.d/init.d/cups. Your system may
- have a different way to restart the CUPS server. OS X uses the
- following command:
+ above; that release of CUPS fixes some important bugs. Gutenprint
+ supports CUPS 1.2, but at this time does not take advantage of the
+ new features of that release.
+
+ Gutenprint will normally detect the presence of CUPS on your
+ system and will attempt to build the CUPS driver if it finds CUPS
+ installed. If your distribution separates the CUPS installation
+ into development and runtime packages, you must install the CUPS
+ development package (cups-devel or similar). You may need to
+ install other development packages depending upon how your
+ distribution has built CUPS. The list of packages varies, but
+ commonly development packages for TIFF (libtiff-devel), JPEG
+ (jpeg-devel or libjpeg-devel), PNG (libpng-devel) and OpenSSL
+ (openssl-devel) will be required. Failure to install these
+ packages will lead to errors when the package is compiled.
+
+ Installing the CUPS driver for Gutenprint 5.0 will not interfere
+ with your ability to continue using the Gimp-Print 4.2 CUPS
+ driver.
+
+ The Gutenprint CUPS driver consists of the following components:
+
+ * The core Gutenprint CUPS driver, rastertogutenprint.5.0. This
+ is a CUPS filter that converts CUPS raster data into
+ printer-specific data. This is most commonly installed in
+ /usr/lib/cups/filter.
+
+ * Back ends for driving Canon and Epson printers, named "canon"
+ and "epson". These provide the ability to get information from
+ the printer for CUPS to use, and are normally installed in
+ /usr/lib/cups/backend. Additional utilities to send certain
+ commands to these printers are installed as commandtocanon and
+ commandtoepson; they are installed in /usr/lib/cups/filter.
+
+ * One or more sets of PPD files describing all of the printers
+ supported by Gutenprint. These are normally installed in
+ /usr/share/cups/model/gutenprint. These PPD files can only be
+ used by the precise version of Gutenprint that they were built
+ with; for example, it is not possible to use PPD files from
+ Gutenprint 5.0.0 with Gutenprint 5.0.1.
+
+ * A utility to update PPD files from an earlier release of
+ Gutenprint, cups-genppdupdate.5.0. This utility may be used to
+ update PPD files generated by earlier versions of Gutenprint
+ starting from 4.3.21. This is normally installed in /usr/sbin.
+ This utility cannot update PPD files from Gimp-Print 4.2.
+
+ * A utility to generate PPD files, cups-genppd.5.0. Normally this
+ is only required when the package is built.
+
+ * A utility to permit additional color calibration for
+ Gutenprint-supported printers, cups-calibrate. This is normally
+ installed in /usr/bin.
+
+ WARNING: With certain versions of CUPS and in certain non-default
+ configurations, if a new version of Gutenprint is installed
+ over an existing version genppd will create PPD files based on
+ the older version of Gutenprint rather than the newer version.
+ This will happen if all of the following are true:
+
+ i) The cups-config provided by the CUPS driver adds
+ -Wl,rpath=/usr/lib. This is done by some versions of CUPS
+ reportedly because in some cases the runtime linker does
+ not pick up libraries out of /usr/lib. This can be checked
+ by running
+
+ cups-config --libs --ldflags
+
+ and inspecting the output for any mention of "rpath",
+ "RPATH", "RUN_PATH", or the like. This is controlled by
+ the CUPS installation on your system.
+
+ ii) There is presently a version of Gutenprint installed in
+ /usr (--prefix=/usr) rather than /usr/local or the like.
+ The default location of Gutenprint installation is in
+ /usr/local, but system vendors typically install Gutenprint
+ in /usr.
+
+ iii) Gutenprint is built dynamically only (--disable-static or
+ --disable-static-genppd). This is not a default, and
+ requires the explicit --disable-static or
+ --disable-static-genppd on the Gutenprint "configure"
+ command line. Therefore, if you build Gutenprint normally
+ you should not be vulnerable to this problem.
+
+ Note that in general if you install CUPS into a non-standard
+ location, and install Gutenprint into the same location, this
+ problem can surface. For example, if you choose to install
+ CUPS in /usr/local and Gutenprint in /usr/local you are
+ vulnerable to this. However, it is not standard practice to
+ install CUPS anywhere but /usr.
+
+ In this case, the run path embedded in the genppd executable
+ points to the version of Gutenprint installed in /usr/lib.
+ This run path overrides any attempt by libtool to look in the
+ build directory. The result is that cups-genppd and
+ rastertogutenprint are run against the older version of
+ Gutenprint. If the new version contains additional features
+ (more printers, changes to printer options, etc.) they will
+ not be available.
+
+ This bug is difficult to detect in a normal build. It
+ normally does not cause an error to happen during build unless
+ there is an API change from the version installed and the
+ version being built; the only failure is frequently that some
+ PPD files may not be built or may be built with missing
+ options. Due to the PPD version checking introduced in this
+ release, the behavior might manifest itself as a runtime
+ error. It is also possible that there will be no error at all
+ other than the older version of Gutenprint being used, with
+ the result that new features and bug fixes are not available.
+
+ If you wish to use only shared libraries, do not wish to build
+ static libraries at all, and are vulnerable to this issue
+ (because cups-config --ldflags sets the run path), there are
+ three workarounds available:
+
+ i) Build and install Gutenprint into /usr (rather than
+ /usr/local) and then rebuild Gutenprint from scratch. This
+ will install the correct libgutenprint.so in /usr/lib, and
+ in the rebuild genppd will be run against the correct
+ library.
+
+ ii) Remove the old version of Gutenprint prior to building the
+ new version of Gutenprint. The important files to remove
+ are anything named /usr/lib/libgutenprint*.
+
+ iii) Edit cups-config to remove the reference to the run path.
+
+ Following installation of the package with "make install", you
+ must restart CUPS to permit CUPS to see the new PPD files. The
+ exact command to restart CUPS varies; it is typically something
+ like /etc/init.d/cups, /etc/software/init.d/cups, /etc/rc.d/cups,
+ /usr/sbin/rccups, or even /etc/rc.d/init.d/cups. Your system may
+ have a different way to restart the CUPS server. OS X, for
+ example, uses the following command:
sudo /System/Library/StartupItems/PrintingServices/PrintingServices.sh restart
@@ -127,453 +358,404 @@ CUPS
the command cups-genppdupdate.5.0, after which you should restart
CUPS as described above. We strongly recommend use of this update
procedure. This script will automatically update Gutenprint PPD
- files from earlier versions. This script will only work with
- Gimp-Print 4.3.21 or above, or any earlier version of Gutenprint;
- it will not update Gimp-Print 4.2 PPD files. However, you may
- install Gutenprint 5.0 alongside Gimp-Print 4.2, and use both
- Gimp-Print 4.2 and Gutenprint 5.0 drivers concurrently.
+ files from earlier versions. This script will only update PPD
+ files from earlier versions of Gutenprint; it will not update
+ Gimp-Print 4.2 PPD files. However, you may install Gutenprint 5.0
+ alongside Gimp-Print 4.2, and use both Gimp-Print 4.2 and
+ Gutenprint 5.0 drivers concurrently in separate printer queues.
Therefore, you need not convert a workflow based on Gimp-Print 4.2
- right away, but can gradually convert or even use both drivers for
- different printer queues.
-
- If you do not choose to automatically update existing PPD files,
- you should reinstall any printers that you are using Gutenprint
- PPD files with. The Gutenprint driver and the PPD files must be
- kept in sync, since the PPD files reflect the particular version
- of the driver that they were built against. If you attempt to use
- a version of Gutenprint with PPD files not built for that precise
- version, the driver will fail with a diagnostic error message.
- For example, PPD files built for Gutenprint 5.0.0-beta4 will not
- work with driver version 5.0.0-rc3. You can identify printers
- using Gutenprint PPD files by the name of the PPD file, which will
- be something like:
-
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
-
- NOTE for Linux (at least) users: If you are using CUPS 1.1.11 or
- higher, and you have a USB-connected printer, you must have a
- printer connected to each USB port that you plan to use and
- powered on when you restart CUPS. If you do not do so, you will
- not be able to reinstall the printer. It is only necessary to do
- this if you wish to update PPD files manually; if you use
- cups-genppdupdate.5.0, you do not need to do this.
+ right away, but can gradually convert or even permanently use both
+ drivers for different printer queues.
- Starting with CUPS 1.1.11, you cannot choose an AppSocket
- connection and enter "usb:/dev/usblp0" or the like as the URI; you
- will get a "client-error-not-possible" error at the end of the
- installation process, and you will have a message like the
- following in your CUPS error log (typically
- /var/log/cups/error_log):
+ The following options to configure are available for compiling the
+ Gutenprint driver for CUPS:
-E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/usb/lp0'!
+ --disable-translated-cups-ppds
- If the printer was turned on correctly, you will be given a choice
- of a USB connection in the Device dialog.
+ By default, PPD files for all languages available in
+ Gutenprint are created. If this option is used, only the
+ default (US-English) PPD files are created. Distributors may
+ wish to package up the PPD files separately for each language.
- You may also have problems if you have a .lpoptions file that has
- old options set. If you have problems printing, please remove any
- existing .lpoptions file in your home directory and try printing
- again.
+ Some systems may not build the translated PPD files correctly,
+ in which case all of the PPD files will be in English. If
+ this is the case on your system, you should use
+ --disable-translated-cups-ppds to avoid having many duplicate
+ PPD files.
- This package normally builds PPD files containing all available
- options for the printer chosen. Many of these options
- (particularly the color adjustments) are not needed in most cases
- and may confuse people. It is possible to generate PPD files
- containing only a minimal set of options and basic paper sizes for
- each printer. Distributors may wish to package the two sets of
- PPD files separately allowing end users to select one or both
- sets (the two sets of PPD files have different names and can
- coexist).
+ --enable-simplified-cups-ppds
- To generate both the simplified and the standard full-featured PPD
- files, you should run configure as follows:
+ Gutenprint 5.0 offers an option of creating simplified PPD
+ files (containing only basic options and standard paper sizes)
+ in addition to PPD files offering all available options
+ (including all color correction options). If this option is
+ used, both the simplified and standard PPD files are created.
+ If --enable-simplified-cups-ppds=only is specified, only the
+ simplified PPD files are built.
- ./configure --with-cups --enable-simplified-cups-ppds=yes
+ --disable-cups-level3-ppds
- If you wish to generate only the simplified PPD files, you may run
+ By default, the Gutenprint PPD files are configured for
+ PostScript Level 3. If this option is used, Level 2 PPD files
+ are created. This may be useful if you are using a version of
+ CUPS older than 1.1.15. It is normally not necessary to use
+ this explicitly, as the configure script detects the version
+ of CUPS in use and selects the appropriate PostScript level
+ automatically.
- ./configure --with-cups --enable-simplified-cups-ppds=only
+ --disable-cups-ppds-at-top-level
- This package normally builds translated versions of the PPD files.
- This provides PPD files translated into the languages that this
- package supports. However, the translation process does not work
- correctly on all systems; in particular, many BSD systems are
- known to simply build multiple copies of the English PPD files.
- In addition, you may not need all of these PPD files installed on
- your system. If your system does not build these files correctly,
- which will be apparent when you use a CUPS front end to select a
- PPD file and you see something like this:
+ Normally, the PPD files are placed in
+ /usr/share/cups/model/gutenprint/5.0. If this option is used,
+ the PPD files are placed in /usr/share/cups/model. There is
+ normally no good reason to use this option.
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
+ --disable-static-genppd
- rather than this:
+ Build genppd and rastertogutenprint dynamically linked rather
+ than statically linked. WARNING: Use of this option may lead
+ to failure during build or installation, or incorrect
+ installation. It is *STRONGLY* recommended that you not use
+ this option unless you are certain that you understand the
+ problem and how to work around it.
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(en)
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(sv)
- EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc3(fr)
+ NOTES TO PACKAGERS:
- you may wish to turn off the translation of PPD files:
+ * We recommend that your installation package run
+ cups-genppdupdate.5.0 and restart CUPS as part of the
+ installation process.
- ./configure --with-cups --disable-translated-cups-ppds
+ * All files and directories with versioned names
+ (e. g. cups-genppdupdate, rastertogutenprint, the PPD files) may
+ be installed concurrently with other versions of Gimp-Print and
+ Gutenprint as described above. Other executables (such as the
+ Canon and Epson back ends, and cups-calibrate) are not
+ versioned, but are not linked against libgutenprint and do not
+ have any other dependencies on Gutenprint.
- You may also wish to do this to greatly reduce the number of PPD
- files installed on your system, as the number of translations is
- large and growing.
- The PPD files associated with this driver are normally for Level 3
- PostScript. CUPS versions starting with 1.1.15 fully implement
- Level 3 Postscript, but earlier versions do not implement a few
- Level 3 constructs. The configuration script will attempt to
- detect the version of CUPS and generate appropriate PPD files. If
- you wish to build PPD files for Level 2 Postscript even with a
- newer version of CUPS, you can run
+----------------
- ./configure --with-cups --disable-cups-level3-ppds
+C) FOOMATIC
- We recommend that all users who wish to use this package for
- general purpose printing install either CUPS or use Foomatic with
- the Ghostscript driver (both described below) and use that as
- their printing system, rather than the traditional lpd or lp
- systems. It is much simpler to manage than lpd, and provides an
- excellent web-based interface for both administration and use.
- Please visit http://www.cups.org for information on downloading
- and installing CUPS.
-
-
-THE GIMP
-
- Gutenprint may be used as a plug-in for the GIMP, providing the
- ability to print images. If you wish to do so, you must use the
- GIMP 1.2.3 or above on the 1.2 line, or any GIMP 2.x release (2.0,
- 2.1, 2.2, etc.) Please read the release notes in addition to this
- README, as there have been some changes in procedure since
- Gimp-Print 4.2 if you are using certain versions of the GIMP.
-
- To build and install the GIMP Print plug-in for the GIMP 1.2:
-
- ./configure [--with-gimp]
- make
- make install
+ Foomatic is a printer meta-driver that can be used with any
+ spooler (CUPS, lpd, LPRng, etc.) or even no spooler at all. It
+ uses XML data describing printer and driver capabilities in
+ conjunction with Ghostscript to allow printing in any environment.
+ Please visit http://www.linuxprinting.org/foomatic.html for more
+ information.
+
+ We normally recommend using the native CUPS driver described above
+ if your system uses CUPS as its spooler. However, some systems
+ (many releases of Fedora Core, for example) use Foomatic as the
+ repository for all printer information; the tools provided on
+ those systems will not recognize the CUPS PPD files. If your
+ system uses Foomatic in this way, or does not use CUPS, you should
+ use Foomatic to manage your printers.
+
+ The Gutenprint driver for Foomatic requires Foomatic 2.0 or
+ higher; Foomatic 3.0 or above is highly recommended. It also
+ requires GNU Ghostscript 6.53 or newer, AFPL Ghostscript 7.04 or
+ newer, or ESP Ghostscript 7.05 or newer for IJS support.
+
+ The Foomatic support in Gutenprint consists of a data generator
+ and an IJS-based Ghostscript driver. It is possible to use the
+ Ghostscript driver without Foomatic, but the Gutenprint options
+ are complex and subject to change without notice. Older printer
+ configuration tools such as apsfilter and magicfilter do not
+ provide a convenient interface to the driver's capabilities.
+ Therefore, we no longer provide documentation on direct use of the
+ Ghostscript driver without the Foomatic front end.
+
+ The Ghostscript driver in Gutenprint 5.0 is based on the IJS
+ protocol. IJS is a protocol originally developed by
+ Hewlett-Packard to allow new drivers to be used with Ghostscript
+ without having to be compiled into Ghostscript. As this driver
+ runs in a separate process, and IJS is licensed in a way
+ compatible with the GPL, this driver may be used with AFPL
+ Ghostscript if desired. We no longer offer the legacy "stp"
+ driver provided in Gimp-Print 4.2. This driver was difficult to
+ maintain and required a complex procedure to integrate with
+ Ghostscript.
+
+ Gutenprint 5.0 offers two Foomatic drivers, one supporting the
+ full range of options and the other supporting simplified options,
+ as describe above under CUPS. The full-featured driver is named
+ "gutenprint-ijs.5.0"; the simplified driver is named
+ "gutenprint-ijs-simplified.5.0". This allows Gutenprint 5.0 to
+ coexist with Gimp-Print 4.2; both drivers may be installed and
+ used (on separate printer queues, of course) on the same system.
+
+ Normally, the Gutenprint configure script will automatically
+ detect the presence of Foomatic and Ghostscript on your system.
+ In some cases, you may have to install a Ghostscript development
+ package that may be named gs-devel, ghostscript-library, or the
+ like for the IJS capability.
+
+ The Foomatic driver will not allow use of PPD files created from
+ Foomatic data from a different version of Gutenprint. This
+ ensures that the PPD files accurately match the driver in use.
+ However, there is no automatic upgrade tool provided for the
+ Foomatic driver, unlike the CUPS driver. Therefore, all queues
+ using a Gutenprint driver must be updated manually, using either
+ tools provided by your distribution or the Foomatic tool
+ "foomatic-ppdfile".
+
+ NOTES TO PACKAGERS:
+
+ * We recommend packaging the IJS driver
+ (/usr/bin/ijsgutenprint.5.0) and its man page
+ (/usr/man/man1/ijsgutenprint.1.gz) together with the Foomatic
+ data.
+
+ * The IJS driver and the Foomatic data kit and PPD files are
+ versioned, and hence you should consider permitting multiple
+ versions to be installed concurrently. The man page
+ (/usr/man/man1/ijsgutenprint.1.gz) is not versioned.
+
+
+----------------
+
+D) THE GIMP
+
+ Gutenprint may be used with an enhanced Print plug-in for the
+ GIMP, providing the ability to print images. If you wish to do
+ so, you must use the GIMP 1.2.3 or above on the 1.2 line, or any
+ GIMP 2.x release (2.0, 2.1, 2.2, etc.) Please read the release
+ notes in addition to this README, as there have been some changes
+ in procedure since Gimp-Print 4.2 if you are using certain
+ versions of the GIMP.
+
+ The enhanced Print plugin for the GIMP replaces the Gimp-Print
+ 4.2-based plugin provided with the GIMP 2.0 and 2.2. As of the
+ GIMP 2.4, the GIMP team provides a new Print plugin based on the
+ GtkPrint framework. This plugin provides standard printing
+ capabilities, but does not provide all of the new Gutenprint 5.0
+ features. Therefore, the enhanced Print plugin for the GIMP
+ distributed with Gutenprint does not replace that plugin, but is
+ installed alongside that plugin.
+
+ If your system separates development packages from runtime
+ packages, you will typically have to install development packages
+ for the GIMP itself, in addition to GTK and glib. With the GIMP
+ 2.x and GTK 2.x, additional packages may be required.
+
+ Normally, the Gutenprint configure script detects which version,
+ if any, of the GIMP is installed and builds an appropriate plugin.
+ If the configure script does not detect it properly, you may need
+ to specify --with-gimp or --with-gimp2. However, it's more likely
+ that you need to install appropriate development packages.
+
+ Normally Gutenprint installs the GIMP Print plugin in your system
+ plug-in directory. If you wish to install it in your personal
+ plugin directory, you may use
- For the GIMP 2.0 or above, the option "--with-gimp2" rather than
- "--with-gimp" should be used.
+ ./configure --enable-user-install
- You may optionally specify --with-gimp or --with-gimp2 if you wish
- to be explicit about building the GIMP Print plugin; --with-gimp
- is implied if `configure' detects that the GIMP is installed, so
- you do not actually need to specify it.
+ It is not possible for Gimp-Print 4.2 and Gutenprint 5.0 (or any
+ future release) to coexist in the same installation of the GIMP.
+ The Gutenprint 5.0-based plugin can read settings from previous
+ versions of Gimp-Print, but the configuration file format in
+ Gutenprint 5.0 cannot be read by older versions of Gimp-Print.
- This installs the GIMP Print plugin in your system plug-in
- directory. If you wish to install it in your personal plugin
- directory, you may use
+ The GIMP 1.2 will not be supported in Gutenprint 5.1 and beyond.
+ However, all Gutenprint 5.0 releases will support the GIMP 1.2.
- ./configure --enable-user-install
+ The GIMP 2.x plugin may eventually be migrated to the GIMP project
+ for a future GIMP release and be removed from the Gutenprint
+ distribution.
- If you have installed the GIMP as a precompiled package
- (e. g. from an RPM), you will need to install the gimp-devel
- (sometimes called gimp-developer, or something similar) package as
- well as the gimp package. The GIMP package as supplied in most
- distributions only contains what's needed to run the GIMP, not the
- additional files needed to build GIMP-based applications and
- plugins such as the Print plugin. On some systems, you will also
- need to install gtk-devel and glib-devel packages as well.
+ NOTE TO PACKAGERS:
- If you have installed the GIMP from source on Linux: after running
- make install, you must run ldconfig as root before attempting to
- build this plugin.
+ * The GIMP plugin, unlike the core library and the Foomatic and
+ CUPS drivers, may not be installed concurrently with other
+ versions. For example, you may not install both the Gimp-Print
+ 4.2 and the Gutenprint 5.0 version of the Print plugin, as they
+ use different configuration file formats.
- The GIMP 1.2 will not be supported in Gutenprint 5.1 and beyond.
- However, all Gutenprint 5.0 releases will support The GIMP 1.2.
- The GIMP 2.x plugin may eventually be migrated to The GIMP project
- for a future GIMP release. It may be removed from the Gutenprint
- distribution in Gutenprint 5.1.
+----------------
+E) ESCPUTIL
-FOOMATIC
+ "escputil" is a command line utility for administering Epson
+ inkjet printers. It performs head alignment, retrieval of ink
+ levels and status information, printing of test patterns, etc. It
+ is built and installed by default; if you don't want it, you may
+ use --without-escputil when configuring.
- Gutenprint includes support for the Foomatic meta-driver package.
- This requires the foomatic-xml distribution. Foomatic is
- available from http://www.linuxprinting.org/foomatic.html. The
- first version of Foomatic (the one used with Gimp-Print 4.0) is
- not compatible with Gutenprint 5.0. Note that the Foomatic driver
- was named `stp' in Gimp-Print 4.0; in Gimp-Print 4.2 (and early
- 4.3) it was named `gimp-print' for the Ghostscript ("stp") driver
- and "gimp-print-ijs" for the IJS driver. In 5.0 only the
- "gutenprint-ijs" data is present. The data for the Gimp-Print 4.2
- driver is not compatible with the 5.0 driver.
+ escputil uses the readline package for interactive commands
+ (currently only head alignment falls into this category). Linking
+ against libreadline sometimes requires linking against other
+ packages. Gutenprint attempts to determine the correct packages
+ to link against; the exact sequence is described in the release
+ notes. If you do not wish to use readline, you may use
+ --without-readline.
- Furthermore, as of Gutenprint 5.0 the Foomatic driver will include
- the release version of Gutenprint in its name. Therefore, the
- Foomatic name for this driver is "gutenprint-ijs.5.0".
+ Unlike the case in Gimp-Print 4.2, this utility is not standalone;
+ it requires the installation of the core Gutenprint package to
+ function. This allows it to support new printers without
+ modification.
- Foomatic data generation works correctly as of Gutenprint
- 5.0.0-beta4 and later releases, and is now an appropriate solution
- for queue configuration.
- To verify that you have an appropriate version of Foomatic, please
- run
- foomatic-kitload
+================================================================
- or
+III) GETTING STARTED
- /usr/local/sbin/foomatic-kitload (if /usr/local/sbin is not on your PATH).
+ This section describes how to get started by installing printers
+ under Gutenprint. Please see the user's manual (in
+ doc/gutenprint-users-manual.odt or
+ doc/gutenprint-users-manual.pdf) for more information.
- Both Foomatic 2.0.x (old stable branch) and 3.0 (current stable
- branch) are supported. With Foomatic 3.0 there are the extra
- features of heaving an additional "PrintoutMode" option with
- pre-configurations for common printing tasks and the options being
- put into different groups ("General", "PrintoutMode",
- "Adjustment").
+----------------
- If you don't have Foomatic installed, or the version that is
- installed is too old, please download the current Foomatic 3.0x
- package from
+A) PRINTER INSTALLATION
- http://www.linuxprinting.org/download/foomatic/foomatic-current.tar.gz
+ The actual procedure to install a printer depends upon your
+ operating system and the spooler (printing system) in use on your
+ system.
- and follow the instructions in that package. See
+ Gutenprint does not normally require the use of non-standard
+ procedures (such as starting special programs) to install
+ printers. Assuming that you are using either CUPS or Foomatic, it
+ integrates with your printing system, so the tools provided by
+ your distribution vendor should work correctly with Gutenprint.
- After Foomatic is installed, build the Foomatic data as follows:
+ Most printing systems currently use PPD files to describe printer
+ capabilities. Some printers are supported by more than one
+ driver, so you may find more than one PPD file for your printer.
+ Gutenprint PPD files are described as
- ./configure --with-foomatic
- make
- make install
+ Epson Stylus Photo R300 Foomatic/gutenprint-ijs.5.0
+ Epson Stylus Photo R300 Foomatic/gutenprint-ijs-simplified.5.0
+ Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.0
+ Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.0 Simplified
- The "make install" step will add the necessary data to your
- Foomatic installation. It must be run as root. It will fail if
- Foomatic is not installed or your Foomatic is too old. Now you
- can either set up a queue for your printer with
- "foomatic-configure" (see USAGE file in the Foomatic package) or
- generate the printer description file for your spooler (with
- "foomatic-datafile") and configure your printer as described on
- the spooler-specific web pages of linuxprinting.org.
+ The "simplified" PPD files offer a basic set of options only, for
+ selecting printer options, standard paper sizes, and basic quality
+ settings. The PPD files that are not "simplified" offer a much
+ broader set of controls, giving the user extensive control over
+ quality and color adjustment.
- IMPORTANT: Whenever you install a new version of Gutenprint you
- must re-create the printer queues using Gutenprint with Foomatic
- (these queues have a driver name of "gutenprint-ijs.5.0").
+ If you are using CUPS, you may be offered a choice between
+ CUPS+Gutenprint and Foomatic/gutenprint-ijs PPD files. While
+ either kind of PPD file will work, we recommend using the
+ CUPS+Gutenprint PPD files. These PPD files can be automatically
+ updated with cups-genppdupdate.5.0.
- Note that it almost never makes sense to build the Foomatic driver
- without also building the Ghostscript driver, even if Foomatic is
- to be used with CUPS (CUPS-O-Matic). Please read the instructions
- below in the GHOSTSCRIPT section.
+ Other PPD files are described differently, such as
- If you do not wish to build the Print plugin for the GIMP plugin,
- you must run
+ Epson MJ 520C Foomatic/stcolor (recommended)
- ./configure --with-foomatic --without-gimp
+ These PPD files, whether "recommended" or not, are not Gutenprint
+ PPD files.
- or
+ NOTES FOR CUPS USERS:
- ./configure --with-ghostscript --with-foomatic --without-gimp
-
- Please visit http://www.linuxprinting.org/foomatic.html for more
- information on Foomatic.
+ If you do not choose to automatically update existing PPD files,
+ you should reinstall any printers that you are using Gutenprint
+ PPD files with. The Gutenprint driver and the PPD files must be
+ kept in sync, since the PPD files reflect the particular version
+ of the driver that they were built against. If you attempt to use
+ a version of Gutenprint with PPD files not built for that precise
+ version, the driver will fail with a diagnostic error message.
+ For example, PPD files built for Gutenprint 5.0.0-beta4 will not
+ work with driver version 5.0.0. You can identify printers using
+ Gutenprint PPD files by the name of the PPD file, which will be
+ something like:
+
+ EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0(en)
+
+ Linux users please note: If you are using CUPS 1.1.11 or higher,
+ and you have a USB-connected printer, you must have a printer
+ connected to each USB port that you plan to use and powered on
+ when you restart CUPS. If you do not do so, you will not be able
+ to reinstall the printer. It is only necessary to do this if you
+ wish to update PPD files manually; if you use
+ cups-genppdupdate.5.0, you do not need to do this.
- Foomatic provides an alternate interface to CUPS, in addition to
- an interface to LPD, LPRng, GNUlpr, PDQ, PPR, CPS, and spooler-less
- printing.
+ Starting with CUPS 1.1.11, you cannot choose an AppSocket
+ connection and enter "usb:/dev/usblp0" or the like as the URI; you
+ will get a "client-error-not-possible" error at the end of the
+ installation process, and you will have a message like the
+ following in your CUPS error log (typically
+ /var/log/cups/error_log):
+E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/usb/lp0'!
-GHOSTSCRIPT
+ If the printer was turned on correctly, you will be given a choice
+ of a USB connection in the Device dialog.
- Gutenprint includes an IJS-based Ghostscript driver. As
- paraphrased from the Ghostscript documentation, IJS is a
- relatively new initiative to improve the quality and ease of use
- of inkjet printing with Ghostscript. Using IJS, one can add new
- drivers, or upgrade existing ones, without recompiling
- Ghostscript. IJS drivers run as separate processes that
- communicate with Ghostscript via an IPC channel. As the basic IJS
- implementation is licensed compatibly with the GPL, and as the
- driver runs in a separate process from Ghostscript itself, the IJS
- driver may be used with AFPL Ghostscript (7.04 and above).
+ You may also have problems if you have a .lpoptions file that has
+ old options set. If you have problems printing, please remove any
+ existing .lpoptions file in your home directory and try printing
+ again.
- The basic way to build the Ghostscript driver is
+================================================================
- ./configure --with-ghostscript [--without-gimp]
- make
- make install
+IV) SOLVING PROBLEMS
- You must have the IJS libraries installed for this to work.
- Instructions for that are included with GNU Ghostscript 6.53 and
- beyond, AFPL Ghostscript 7.04 and beyond, and ESP Ghostscript 7.05
- and beyond.
+ While we have attempted to make use of Gutenprint as
+ straightforward and trouble-free as possible, we certainly
+ recognize that there may be problems with installing and using
+ Gutenprint. In the event of any difficulty, we ask that you take
+ the following actions:
- We strongly recommend that end users use CUPS, or use Foomatic to
- configure printer queues for Gutenprint. The available options
- are very complex and are subject to change, and the older printer
- configuration tools (such as apsfilter and magicfilter) do not
- provide a convenient interface to the driver's capabilities. We
- no longer provide documentation on direct use of this driver
- without the Foomatic front end.
+ 1) Read the release notes (NEWS).
- Gutenprint 5.0 no longer provides the monolithic (legacy
- Ghostscript) "stp" driver present in Gimp-Print 4.2. This driver,
- which was compiled and linked directly into Ghostscript, was very
- difficult to maintain and required a complex integration
- procedure.
+ 2) Read the FAQ, in doc/FAQ.html. Your question may be answered
+ there.
+ 3) Make sure that the paper type and size, and media source, that
+ you have selected matches the paper loaded into the printer.
+ This is only necessary if the printer attempts to print, but
+ does not succeed. It is a good starting point if quality is
+ poor (too dark or too light, wet ink on the paper, etc.).
-RECOMMENDED SETTINGS
+ 4) Reset all settings (particularly the color and quality
+ settings) to their defaults.
- We recommend starting with all default settings for the color
- settings. The settings can be adjusted as necessary for
- particular combinations of ink, paper, and subject material.
+ 5) If you are using CUPS, search /var/log/cups/error_log (which
+ may be located elsewhere on some systems) for lines starting
+ with 'E' (these lines indicate errors). Also search for log
+ information produced by Gutenprint; all such output lines will
+ have "Gutenprint". These lines may help you solve the problem.
- On most inkjet printers, using plain or coated inkjet paper, 600
- or 720 dpi will produce high quality; 1200x1200 or 1440x720 dpi
- will produce extremely high quality. On newer printers with very
- small drops, or when printing photographs to special photo paper,
- higher resolutions such as 2880x1440 DPI may be required to
- achieve the highest quality.
+ 6) If you are using CUPS, enable debugging output. This can be
+ done by editing /etc/cups/cupsd.conf (which must be done as
+ root). There will be a line in that file:
+ LogLevel Info
-SUPPORT
+ which should be changed to
- 1) Read the FAQ, in doc/FAQ.html. Your question may be answered
- there.
+ LogLevel Debug
- 2) Read the user's manual, in doc/users_guide.
+ This will allow CUPS to produce extensive debugging output.
+ You will need to restart CUPS (the exact procedure is
+ system-dependent) after doing this. If you report a problem to
+ the Gutenprint team, you will be asked for this information.
- 3) There are public forums on Sourceforge dedicated to this
+ 7) There are public forums on Sourceforge dedicated to this
package. Please see
http://sourceforge.net/forum/?group_id=1537 for more
information. The Help forum is a good source of information.
- 4) If you have a technical support issue that does not appear to
+ 8) If you have a technical support issue that does not appear to
be a bug in the software, you can use the Tech Support Manager.
Please see http://sourceforge.net/support/?group_id=1537.
- 5) If you have found a clear bug in the package, you may file a
+ 9) If you have found a clear bug in the package, you may file a
bug report at http://sourceforge.net/bugs/?group_id=1537.
- 6) You may send mail to the gimp-print-devel@sourceforge.net
+ 10) You may send mail to the gimp-print-devel@sourceforge.net
mailing list. This is recommended as a last resort only.
+================================================================
-KNOWN BUILD/INSTALLATION ISSUES
-
- As of Gutenprint 5.0.0-rc1, the description of known issues has
- been moved to the NEWS file (release notes).
-
-
-PACKAGING
-
- We recommend that packagers and distributors of Gutenprint use the
- following settings to build the package:
-
- --with-foomatic
- --with-ghostscript
- --with-user-guide
- --with-samples
- --with-escputil
-
- We suggest the following packaging:
-
- * A Gutenprint core package should contain the following. You may
- wish to install the user's guide only in certain formats.
-
- /usr/lib/libgutenprint.so.2.x.y (the core shared library)
- /usr/bin/escputil (Epson Stylus utility)
- /usr/bin/ijsgutenprint.5.0 (Gutenprint Ghostscript IJS plug-in driver)
- /usr/share/gutenprint/doc/html (HTML documentation)
- /usr/share/gutenprint/doc/users-guide.pdf
- /usr/share/gutenprint/doc/users-guide.ps
- /usr/share/locale/*/LC_MESSAGES/gutenprint.mo
-
- * A gutenprint-devel package (for developers) should contain the
- following. Again, you may wish to install the programmer's
- manual only in certain formats.
-
- /usr/include/gutenprint
- /usr/bin/gutenprint-config
- /usr/share/gutenprint/doc/manual-html
- /usr/share/gutenprint/doc/gutenprint.ps
- /usr/share/aclocal/gutenprint.m4
- /usr/lib/libgutenprint.a
- /usr/lib/libgutenprint.so
-
- You may wish to include the test pattern generator source and
- the sample test pattern in this package, and you may wish to
- include test patterns of your own. You may also wish to include
- the various unprint programs and the parse-* scripts from the
- test directory, although these are typically of more use to
- developers of the Gutenprint package per se than developers of
- applications layered on Gutenprint. However, the test programs
- have received less testing than the others, and are known to
- have some limitations that are not documented.
-
- * A gutenprint-extras package should contain
-
- /usr/share/gutenprint/samples
-
- You may wish to include the test pattern generator and the
- sample test pattern from src/testpattern if you don't include it
- in the developer package; test/unprint; test/pcl-unprint;
- test/bjc-unprint; test/parse-escp2; and test/parse-bjc in this
- package.
-
- * Ghostscript requires GNU Ghostscript 6.53 or above, or ESP
- Ghostscript 7.05 or above.
-
- * CUPS packages should include the gutenprint PPD's in
- /usr/share/cups/model, and the following utilities:
-
- + "epson" and "canon" belong in /usr/lib/cups/backend.
-
- + "rastertogutenprint-5.0", "commandtoepson", and
- "commandtocanon" belong in /usr/lib/cups/filter.
-
- + "cups-calibrate" belongs in /usr/bin.
-
- + "command.types" belongs in /etc/cups.
-
- + "calibrate.ppm" belongs in /usr/share/cups.
-
- The PPD's packaged with gutenprint consume a lot of space. At
- present, a full set of full-featured PPD files consumes about
- 7.5 MB per language (about 750 files); a full set of simplified
- PPD files consumes about 3 MB additional per language. At
- present, sixteen language translations are installed, in
- addition to the US English defaults: Danish, German, Czech,
- Greek, Spanish, Hungarian, Japanese, Norwegian, Dutch, Polish,
- Portuguese, Slovak, GB English, and Chinese (Taiwan). This
- totals about 25,000 files, so you may wish to install the
- translated PPD files separately. You may additionally wish to
- separate the simplified and standard PPD files.
-
- Please see KNOWN BUILD ISSUES above for more discussion about
- build issues related to the PPD files.
-
- * A gutenprint-foomatic package, containing the
- src/foomatic/foomatic-db/gutenprint*/ directories, should be
- provided to allow people who wish to use foomatic to install the
- corresponding data files. The packaging should arrange to call
- "foomatic-kitload" (or the equivalent) on this tree when it is
- installed.
-
- An alternative option is to install pregenerated PPD files,
- which may be created with foomatic-compiledb.
-
- * Please read the release notes carefully!
-
- * Distributors (UNIX vendors and Linux distributors) should
- subscribe to the gimp-print-devel@sourceforge.net mailing list
- to monitor development activities. When reporting a problem
- related to building the package for distribution, please
- identify yourself as such. The Gutenprint package is primarily
- an infrastructure package, rather than an end-user application,
- and as such we particularly want to fix any problems that
- interfere with building and distribution of this package on any
- POSIX-compliant operating system.
-
-
-USE OF THE CVS REPOSITORY
+V) USE OF THE CVS REPOSITORY
Please read doc/README.maintaining for instructions on how to
build from the CVS repository. You will need additional packages
and tools for this purpose.
-
diff --git a/configure b/configure
index 4116ac0..79a53a4 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.139 .
+# From configure.ac Revision: 1.145 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc3.
+# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0.
#
# Report bugs to <gimp-print-devel@lists.sourceforge.net>.
#
@@ -441,8 +441,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='gutenprint'
PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.0-rc3'
-PACKAGE_STRING='gutenprint 5.0.0-rc3'
+PACKAGE_VERSION='5.0.0'
+PACKAGE_STRING='gutenprint 5.0.0'
PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
ac_unique_file="src/main/print-vars.c"
@@ -483,7 +483,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH WHICH_PPDS LIBOBJS LTLIBOBJS LTALLOCA'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE BUILD_GIMP2_AS_GUTENPRINT_TRUE BUILD_GIMP2_AS_GUTENPRINT_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH WHICH_PPDS LIBOBJS LTLIBOBJS LTALLOCA'
ac_subst_files=''
# Initialize some variables set by options.
@@ -992,7 +992,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gutenprint 5.0.0-rc3 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1058,7 +1058,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gutenprint 5.0.0-rc3:";;
+ short | recursive ) echo "Configuration of gutenprint 5.0.0:";;
esac
cat <<\_ACEOF
@@ -1086,7 +1086,9 @@ Optional Features:
generate PostScript level 3 PPD files
[(automatic)]
--enable-static-genppd build a statically-linked cups-genppd and
- rastertogutenprint [(automatic)]
+ rastertogutenprint. WARNING: Please read the README
+ and NEWS (release notes) CAREFULLY before disabling
+ this! [(automatic)]
--enable-debug turn on debugging in build [no]
--enable-profile turn on profiling in build [no]
--disable-gtktest Do not try to compile and run a test GTK program
@@ -1097,7 +1099,6 @@ Optional Features:
build Gutenprint GTK+-2.0 user interface library
[(automatic)]
--enable-samples install sample images [yes]
- --enable-user-guide install user guide [yes]
--enable-escputil build escputil [yes]
--enable-test build test programs [yes]
--enable-testpattern build testpattern generator [(automatic)]
@@ -1129,6 +1130,10 @@ Optional Packages:
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
--with-gimp build GIMP 1.2 Print plugin [(automatic)]
--with-gimp2 build GIMP 2.0 Print plugin [(automatic)]
+ --with-gimp2-as-gutenprint
+ name GIMP 2.x Print plugin gutenprint (requires GIMP
+ 2.2; normally used with GIMP 2.4 or above)
+ [(automatic)]
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
@@ -1258,7 +1263,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-gutenprint configure 5.0.0-rc3
+gutenprint configure 5.0.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1289,7 +1294,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gutenprint $as_me 5.0.0-rc3, which was
+It was created by gutenprint $as_me 5.0.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1659,11 +1664,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
GUTENPRINT_MAJOR_VERSION=5
GUTENPRINT_MINOR_VERSION=0
GUTENPRINT_MICRO_VERSION=0
-GUTENPRINT_EXTRA_VERSION=-rc3
+GUTENPRINT_EXTRA_VERSION=
GUTENPRINT_CURRENT_INTERFACE=2
GUTENPRINT_INTERFACE_AGE=0
GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.0-rc3
+GUTENPRINT_VERSION=5.0.0
GUTENPRINTUI_CURRENT_INTERFACE=1
GUTENPRINTUI_INTERFACE_AGE=0
GUTENPRINTUI_BINARY_AGE=0
@@ -1980,7 +1985,7 @@ fi
# Define the identity of the package.
PACKAGE='gutenprint'
- VERSION='5.0.0-rc3'
+ VERSION='5.0.0'
cat >>confdefs.h <<_ACEOF
@@ -3767,7 +3772,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3770 "configure"' > conftest.$ac_ext
+ echo '#line 3775 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5257,7 +5262,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:5260:" \
+echo "$as_me:5265:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6320,11 +6325,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:6323: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6328: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6327: \$? = $ac_status" >&5
+ echo "$as_me:6332: \$? = $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.
@@ -6588,11 +6593,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:6591: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6595: \$? = $ac_status" >&5
+ echo "$as_me:6600: \$? = $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.
@@ -6692,11 +6697,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:6695: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6700: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6699: \$? = $ac_status" >&5
+ echo "$as_me:6704: \$? = $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
@@ -9037,7 +9042,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9040 "configure"
+#line 9045 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9137,7 +9142,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9140 "configure"
+#line 9145 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11477,11 +11482,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:11480: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11485: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11484: \$? = $ac_status" >&5
+ echo "$as_me:11489: \$? = $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.
@@ -11581,11 +11586,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:11584: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11589: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11588: \$? = $ac_status" >&5
+ echo "$as_me:11593: \$? = $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
@@ -13151,11 +13156,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:13154: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13159: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13158: \$? = $ac_status" >&5
+ echo "$as_me:13163: \$? = $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.
@@ -13255,11 +13260,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:13258: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13262: \$? = $ac_status" >&5
+ echo "$as_me:13267: \$? = $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
@@ -15458,11 +15463,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:15461: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15465: \$? = $ac_status" >&5
+ echo "$as_me:15470: \$? = $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.
@@ -15726,11 +15731,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:15729: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15733: \$? = $ac_status" >&5
+ echo "$as_me:15738: \$? = $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.
@@ -15830,11 +15835,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:15833: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15837: \$? = $ac_status" >&5
+ echo "$as_me:15842: \$? = $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
@@ -18812,8 +18817,8 @@ fi
STATIC_GENPPD="$enable_static"
# create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint" >&5
-echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint. WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!" >&5
+echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint. WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!... $ECHO_C" >&6
# Check whether --enable-static-genppd or --disable-static-genppd was given.
if test "${enable_static_genppd+set}" = set; then
enableval="$enable_static_genppd"
@@ -19714,8 +19719,14 @@ else
gimptool_check_minor=`echo "$gimptool_check_version" | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`
if test "$gimptool_check_major" -eq 2; then
BUILD_GIMP2="yes"
+ if test "$gimptool_check_minor" -ge 4 ; then
+ BUILD_GIMP2_AS_GUTENPRINT="yes"
+ else
+ BUILD_GIMP2_AS_GUTENPRINT="no"
+ fi
else
BUILD_GIMP2="no"
+ BUILD_GIMP2_AS_GUTENPRINT="no"
fi
fi
@@ -20002,6 +20013,38 @@ if test -z "${BUILD_GIMP2}" ; then
fi
+# create custom command-line --with option
+echo "$as_me:$LINENO: checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)" >&5
+echo $ECHO_N "checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)... $ECHO_C" >&6
+
+# Check whether --with-gimp2-as-gutenprint or --without-gimp2-as-gutenprint was given.
+if test "${with_gimp2_as_gutenprint+set}" = set; then
+ withval="$with_gimp2_as_gutenprint"
+ case "${withval}" in
+
+ yes) BUILD_GIMP2_AS_GUTENPRINT="yes" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;;
+ no) BUILD_GIMP2_AS_GUTENPRINT="no" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;;
+ *) echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6
+ { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&5
+echo "$as_me: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&2;}
+ { (exit 1); exit 1; }; } ;;
+
+ esac
+else
+ if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
+ BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
+ fi
+ echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;
+fi;
+if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
+ BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
+fi
+
+
# create custom command-line --enable option
echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-2.0 user interface library" >&5
echo $ECHO_N "checking whether to build Gutenprint GTK+-2.0 user interface library... $ECHO_C" >&6
@@ -20065,37 +20108,6 @@ fi
# create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to install user guide" >&5
-echo $ECHO_N "checking whether to install user guide... $ECHO_C" >&6
-# Check whether --enable-user-guide or --disable-user-guide was given.
-if test "${enable_user_guide+set}" = set; then
- enableval="$enable_user_guide"
- case "${enableval}" in
-
- yes) INSTALL_USER_GUIDE="yes" ; echo "$as_me:$LINENO: result: ${INSTALL_USER_GUIDE}" >&5
-echo "${ECHO_T}${INSTALL_USER_GUIDE}" >&6 ;;
- no) INSTALL_USER_GUIDE="no" ; echo "$as_me:$LINENO: result: ${INSTALL_USER_GUIDE}" >&5
-echo "${ECHO_T}${INSTALL_USER_GUIDE}" >&6 ;;
- *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
- { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-user-guide" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-user-guide" >&2;}
- { (exit 1); exit 1; }; } ;;
-
- esac
-else
- if test -z "${INSTALL_USER_GUIDE}" ; then
- INSTALL_USER_GUIDE="yes"
- fi
- echo "$as_me:$LINENO: result: ${INSTALL_USER_GUIDE}" >&5
-echo "${ECHO_T}${INSTALL_USER_GUIDE}" >&6 ;
-fi;
-if test -z "${INSTALL_USER_GUIDE}" ; then
- INSTALL_USER_GUIDE="yes"
-fi
-
-
-# create custom command-line --enable option
echo "$as_me:$LINENO: checking whether to build escputil" >&5
echo $ECHO_N "checking whether to build escputil... $ECHO_C" >&6
# Check whether --enable-escputil or --disable-escputil was given.
@@ -22424,8 +22436,8 @@ fi
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${CONVERT} = x ; then
- { echo "$as_me:$LINENO: WARNING: PostScript user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript user's guide cannot be regenerated!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
fi
fi
# Extract the first word of "texi2html", so it can be a program name with args.
@@ -22559,8 +22571,8 @@ fi
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DB2PDF} = x ; then
- { echo "$as_me:$LINENO: WARNING: PDF user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PDF user's guide cannot be regenerated!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: PDF developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: PDF developer's guide cannot be regenerated!" >&2;}
fi
fi
for ac_prog in dvipdf dvipdfm
@@ -22654,8 +22666,8 @@ fi
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DB2PS} = x ; then
- { echo "$as_me:$LINENO: WARNING: PostScript user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript user's guide cannot be regenerated!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
fi
fi
# Extract the first word of "db2html", so it can be a program name with args.
@@ -22699,8 +22711,8 @@ fi
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DB2HTML} = x ; then
- { echo "$as_me:$LINENO: WARNING: HTML user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML user's guide cannot be regenerated!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
fi
fi
# Extract the first word of "doxygen", so it can be a program name with args.
@@ -22744,8 +22756,8 @@ fi
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DOXYGEN} = x ; then
- { echo "$as_me:$LINENO: WARNING: HTML user's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML user's guide cannot be regenerated!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
+echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
fi
fi
@@ -30118,6 +30130,17 @@ fi
+if test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes; then
+ BUILD_GIMP2_AS_GUTENPRINT_TRUE=
+ BUILD_GIMP2_AS_GUTENPRINT_FALSE='#'
+else
+ BUILD_GIMP2_AS_GUTENPRINT_TRUE='#'
+ BUILD_GIMP2_AS_GUTENPRINT_FALSE=
+fi
+
+
+
+
if test x${INSTALL_SAMPLES} = xyes; then
INSTALL_SAMPLES_TRUE=
INSTALL_SAMPLES_FALSE='#'
@@ -30293,15 +30316,6 @@ else
fi
-if test "$enable_static" = no -a "$BUILD_CUPS" = yes ; then
- { echo "$as_me:$LINENO: WARNING: --enable-static is disabled, but CUPS is being built." >&5
-echo "$as_me: WARNING: --enable-static is disabled, but CUPS is being built." >&2;}
- { echo "$as_me:$LINENO: WARNING: This may result in a *SILENTLY* incorrect build." >&5
-echo "$as_me: WARNING: This may result in a *SILENTLY* incorrect build." >&2;}
- { echo "$as_me:$LINENO: WARNING: Please read the release notes carefully!" >&5
-echo "$as_me: WARNING: Please read the release notes carefully!" >&2;}
-fi
-
@@ -30337,7 +30351,7 @@ cat >>confdefs.h <<_ACEOF
#define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
_ACEOF
-RELEASE_DATE="14 May 2006"
+RELEASE_DATE="22 Jul 2006"
cat >>confdefs.h <<_ACEOF
#define RELEASE_DATE "${RELEASE_DATE}"
@@ -30408,8 +30422,6 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
ac_config_files="$ac_config_files doc/developer/Makefile"
- ac_config_files="$ac_config_files doc/users_guide/Makefile"
-
ac_config_files="$ac_config_files include/Makefile"
ac_config_files="$ac_config_files include/gutenprint/Makefile"
@@ -30688,6 +30700,13 @@ echo "$as_me: error: conditional \"BUILD_GIMP2\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_GIMP2_AS_GUTENPRINT_TRUE}" && test -z "${BUILD_GIMP2_AS_GUTENPRINT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${INSTALL_SAMPLES_TRUE}" && test -z "${INSTALL_SAMPLES_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"INSTALL_SAMPLES\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -30998,7 +31017,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by gutenprint $as_me 5.0.0-rc3, which was
+This file was extended by gutenprint $as_me 5.0.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31061,7 +31080,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-gutenprint config.status 5.0.0-rc3
+gutenprint config.status 5.0.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -31184,7 +31203,6 @@ do
"doc/gutenprint.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
"doc/gutenprintui2.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprintui2.dox" ;;
"doc/developer/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
- "doc/users_guide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/users_guide/Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/gutenprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprint/Makefile" ;;
"include/gutenprintui/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprintui/Makefile" ;;
@@ -31465,6 +31483,8 @@ s,@BUILD_GIMP_TRUE@,$BUILD_GIMP_TRUE,;t t
s,@BUILD_GIMP_FALSE@,$BUILD_GIMP_FALSE,;t t
s,@BUILD_GIMP2_TRUE@,$BUILD_GIMP2_TRUE,;t t
s,@BUILD_GIMP2_FALSE@,$BUILD_GIMP2_FALSE,;t t
+s,@BUILD_GIMP2_AS_GUTENPRINT_TRUE@,$BUILD_GIMP2_AS_GUTENPRINT_TRUE,;t t
+s,@BUILD_GIMP2_AS_GUTENPRINT_FALSE@,$BUILD_GIMP2_AS_GUTENPRINT_FALSE,;t t
s,@INSTALL_SAMPLES_TRUE@,$INSTALL_SAMPLES_TRUE,;t t
s,@INSTALL_SAMPLES_FALSE@,$INSTALL_SAMPLES_FALSE,;t t
s,@INSTALL_USER_GUIDE_TRUE@,$INSTALL_USER_GUIDE_TRUE,;t t
@@ -32261,13 +32281,15 @@ if test "$no_create" != yes; then
fi
+warnings_emitted=0
echo
-echo "Build Summary:"
-echo "----- --------"
+echo "Configuration Summary:"
+echo "------------- --------"
echo
echo "If you have any problems, please report the information below to"
echo "$PACKAGE_BUGREPORT"
echo
+echo "================================================================"
echo " Release: $PACKAGE_STRING generated on $RELEASE_DATE"
echo
echo " Features:"
@@ -32278,10 +32300,15 @@ if test "$BUILD_CUPS" != "no" ; then
echo " Build simplified CUPS PPD files: $BUILD_SIMPLIFIED_CUPS_PPDS"
echo " Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
echo " Install CUPS PPD files at top level: $CUPS_PPDS_AT_TOP_LEVEL"
- if test "$STATIC_GENPPD" = "no" -a "$enable_shared" = "yes" ; then
- echo " Build genppd statically: $STATIC_GENPPD (please read the release notes!)"
- else
- echo " Build genppd statically: $STATIC_GENPPD"
+ echo " Build genppd statically: $STATIC_GENPPD"
+
+ if test "$STATIC_GENPPD" = "no" ; then
+ echo " ***WARNING: Use of --disable-static-genppd or --disable-static"
+ echo " when building CUPS is very dangerous. The build may"
+ echo " fail when building the PPD files, or may *SILENTLY*"
+ echo " build incorrect PPD files or cause other problems."
+ echo " Please review the README and release notes carefully!"
+ warnings_emitted=1
fi
fi
echo " Build Ghostscript IJS driver: $BUILD_GHOSTSCRIPT"
@@ -32289,10 +32316,20 @@ echo " Build Foomatic data: $BUILD_FOOMATIC"
if test "$BUILD_FOOMATIC" != "no" ; then
echo " Build Foomatic 3.x data: $BUILD_FOOMATIC_3"
fi
-echo " Build GIMP 1.2 plugin: $BUILD_GIMP"
-echo " Build GIMP 2.0 plugin: $BUILD_GIMP2"
-if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != no ; then
- echo " Install plugin in home directory: $USER_INSTALL"
+if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
+ echo " Build enhanced Print plugin for the GIMP: yes"
+ echo " Build GIMP 1.2 plugin: $BUILD_GIMP"
+ echo " Build GIMP 2.x plugin: $BUILD_GIMP2"
+ if test "$BUILD_GIMP2" != "no" ; then
+ if test "$BUILD_GIMP2_AS_GUTENPRINT" != "no" ; then
+ echo " GIMP 2.x plugin will be named: gutenprint"
+ else
+ echo " GIMP 2.x plugin will be named: print"
+ fi
+ fi
+ echo " Install plugin(s) in home directory: $USER_INSTALL"
+else
+ echo " Build enhanced Print plugin for the GIMP: no"
fi
echo " Build EPSON Stylus utility: $BUILD_ESCPUTIL"
echo " Build test programs: $BUILD_TEST"
@@ -32304,10 +32341,9 @@ echo " Data directory: $PACKAGE_DATA_DIR"
echo " Library directory: $PACKAGE_LIB_DIR"
echo " XML data directory: $PKGXMLDATADIR"
echo " Module directory: $PKGMODULEDIR"
-echo " Install user guide: $INSTALL_USER_GUIDE"
echo " Install sample images: $INSTALL_SAMPLES"
echo
-echo "Configuration:"
+echo "General configuration:"
if test x$ac_compiler_gnu = "xyes"; then
echo " Compiler options: $CFLAGS $GNUCFLAGS"
else
@@ -32324,7 +32360,12 @@ if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
else
echo " Use readline libraries: $USE_READLINE"
fi
+echo "================================================================"
+if test $warnings_emitted -ne 0 ; then
+ echo
+ echo '*** NOTE: Please review the warnings shown above carefully!'
+fi
echo
-echo "Finished configuring."
-echo "Type 'make' to build the package"
+echo "Finished configuring. Please review the configuration summary above."
+echo "Type 'make clean' followed by 'make' to build the package"
echo "then 'make install' to install it."
diff --git a/configure.ac b/configure.ac
index bc6eaeb..c66f379 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.139 2006/05/12 01:10:19 rlk Exp $
+dnl $Id: configure.ac,v 1.145 2006/07/16 22:59:20 rlk Exp $
dnl Copyright (C) 2001-2004 Roger Leigh
dnl
dnl This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ pushdef([GUTENPRINT_NAME], [gutenprint])
pushdef([GUTENPRINT_MAJOR_VERSION], [5])
pushdef([GUTENPRINT_MINOR_VERSION], [0])
pushdef([GUTENPRINT_MICRO_VERSION], [0])
-pushdef([GUTENPRINT_EXTRA_VERSION], [-rc3])
+pushdef([GUTENPRINT_EXTRA_VERSION], [])
pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
pushdef([GUTENPRINT_INTERFACE_AGE], [0])
pushdef([GUTENPRINT_BINARY_AGE], [0])
@@ -52,7 +52,7 @@ pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.
AC_INIT(GUTENPRINT_NAME, GUTENPRINT_VERSION, [gimp-print-devel@lists.sourceforge.net])
AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.139 $)
+AC_REVISION($Revision: 1.145 $)
AC_CONFIG_SRCDIR(src/main/print-vars.c)
AC_CONFIG_AUX_DIR(scripts)
STP_INIT
@@ -265,7 +265,7 @@ STP_ARG_ENABLE([cups-level3-ppds],
STATIC_GENPPD="$enable_static"
STP_ARG_ENABLE([static-genppd],
- [build a statically-linked cups-genppd and rastertogutenprint],
+ [build a statically-linked cups-genppd and rastertogutenprint. WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!],
[STATIC_GENPPD],
[(automatic)])
@@ -405,8 +405,14 @@ dnl Quote to protect sed regexes
[gimptool_check_minor=`echo "$gimptool_check_version" | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`]
if test "$gimptool_check_major" -eq 2; then
BUILD_GIMP2="yes"
+ if test "$gimptool_check_minor" -ge 4 ; then
+ BUILD_GIMP2_AS_GUTENPRINT="yes"
+ else
+ BUILD_GIMP2_AS_GUTENPRINT="no"
+ fi
else
BUILD_GIMP2="no"
+ BUILD_GIMP2_AS_GUTENPRINT="no"
fi
fi
@@ -426,6 +432,11 @@ STP_ARG_WITH([gimp2],
[BUILD_GIMP2],
[(automatic)])
+STP_ARG_WITH([gimp2-as-gutenprint],
+ [name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)],
+ [BUILD_GIMP2_AS_GUTENPRINT],
+ [(automatic)])
+
STP_ARG_ENABLE([libgutenprintui2],
[build Gutenprint GTK+-2.0 user interface library],
[BUILD_LIBGUTENPRINTUI2],
@@ -436,11 +447,6 @@ STP_ARG_ENABLE([samples],
[INSTALL_SAMPLES],
[yes])
-STP_ARG_ENABLE([user-guide],
- [install user guide],
- [INSTALL_USER_GUIDE],
- [yes])
-
STP_ARG_ENABLE([escputil],
[build escputil],
[BUILD_ESCPUTIL],
@@ -490,7 +496,7 @@ AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
AC_PATH_PROG([CONVERT], [convert])
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${CONVERT} = x ; then
- AC_MSG_WARN([PostScript user's guide cannot be regenerated!])
+ AC_MSG_WARN([PostScript developer's guide cannot be regenerated!])
fi
fi
AC_PATH_PROG(TEXI2HTML, texi2html)
@@ -508,7 +514,7 @@ fi
AC_PATH_PROG(DB2PDF, db2pdf)
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DB2PDF} = x ; then
- AC_MSG_WARN([PDF user's guide cannot be regenerated!])
+ AC_MSG_WARN([PDF developer's guide cannot be regenerated!])
fi
fi
AC_PATH_PROGS(DVIPDF, dvipdf dvipdfm)
@@ -520,19 +526,19 @@ fi
AC_PATH_PROG(DB2PS, db2ps)
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DB2PS} = x ; then
- AC_MSG_WARN([PostScript user's guide cannot be regenerated!])
+ AC_MSG_WARN([PostScript developer's guide cannot be regenerated!])
fi
fi
AC_PATH_PROG(DB2HTML, db2html)
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DB2HTML} = x ; then
- AC_MSG_WARN([HTML user's guide cannot be regenerated!])
+ AC_MSG_WARN([HTML developer's guide cannot be regenerated!])
fi
fi
AC_PATH_PROG(DOXYGEN, doxygen)
if test x${USE_MAINTAINER_MODE} = xyes ; then
if test x${DOXYGEN} = x ; then
- AC_MSG_WARN([HTML user's guide cannot be regenerated!])
+ AC_MSG_WARN([HTML developer's guide cannot be regenerated!])
fi
fi
@@ -800,6 +806,8 @@ AM_CONDITIONAL(BUILD_GIMP, test x${BUILD_GIMP} = xyes)
AM_CONDITIONAL(BUILD_GIMP2, test x${BUILD_GIMP2} = xyes)
+AM_CONDITIONAL(BUILD_GIMP2_AS_GUTENPRINT, test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes)
+
AM_CONDITIONAL(INSTALL_SAMPLES, test x${INSTALL_SAMPLES} = xyes)
AM_CONDITIONAL(INSTALL_USER_GUIDE, test x${INSTALL_USER_GUIDE} = xyes)
@@ -861,12 +869,6 @@ AM_CONDITIONAL(BUILD_MODULES, test x$MODULE = xtrue)
AM_CONDITIONAL(BUILD_GENPPD_STATIC, test x"$STATIC_GENPPD" = xyes)
-if test "$enable_static" = no -a "$BUILD_CUPS" = yes ; then
- AC_MSG_WARN([--enable-static is disabled, but CUPS is being built.])
- AC_MSG_WARN([This may result in a *SILENTLY* incorrect build.])
- AC_MSG_WARN([Please read the release notes carefully!])
-fi
-
dnl Define LTLIBOBJS
AC_CONFIG_COMMANDS_PRE(
[LTLIBOBJS=`echo "$LIB@&t@OBJS" | sed 's/\.o/.lo/g'`
@@ -952,7 +954,6 @@ AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([doc/gutenprint.dox])
AC_CONFIG_FILES([doc/gutenprintui2.dox])
AC_CONFIG_FILES([doc/developer/Makefile])
-AC_CONFIG_FILES([doc/users_guide/Makefile])
AC_CONFIG_FILES([include/Makefile])
AC_CONFIG_FILES([include/gutenprint/Makefile])
AC_CONFIG_FILES([include/gutenprintui/Makefile])
@@ -1006,13 +1007,15 @@ echo
AC_OUTPUT
+warnings_emitted=0
echo
-echo "Build Summary:"
-echo "----- --------"
+echo "Configuration Summary:"
+echo "------------- --------"
echo
echo "If you have any problems, please report the information below to"
echo "$PACKAGE_BUGREPORT"
echo
+echo "================================================================"
echo " Release: $PACKAGE_STRING generated on $RELEASE_DATE"
echo
echo " Features:"
@@ -1023,10 +1026,15 @@ if test "$BUILD_CUPS" != "no" ; then
echo " Build simplified CUPS PPD files: $BUILD_SIMPLIFIED_CUPS_PPDS"
echo " Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
echo " Install CUPS PPD files at top level: $CUPS_PPDS_AT_TOP_LEVEL"
- if test "$STATIC_GENPPD" = "no" -a "$enable_shared" = "yes" ; then
- echo " Build genppd statically: $STATIC_GENPPD (please read the release notes!)"
- else
- echo " Build genppd statically: $STATIC_GENPPD"
+ echo " Build genppd statically: $STATIC_GENPPD"
+
+ if test "$STATIC_GENPPD" = "no" ; then
+ echo " ***WARNING: Use of --disable-static-genppd or --disable-static"
+ echo " when building CUPS is very dangerous. The build may"
+ echo " fail when building the PPD files, or may *SILENTLY*"
+ echo " build incorrect PPD files or cause other problems."
+ echo " Please review the README and release notes carefully!"
+ warnings_emitted=1
fi
fi
echo " Build Ghostscript IJS driver: $BUILD_GHOSTSCRIPT"
@@ -1034,10 +1042,20 @@ echo " Build Foomatic data: $BUILD_FOOMATIC"
if test "$BUILD_FOOMATIC" != "no" ; then
echo " Build Foomatic 3.x data: $BUILD_FOOMATIC_3"
fi
-echo " Build GIMP 1.2 plugin: $BUILD_GIMP"
-echo " Build GIMP 2.0 plugin: $BUILD_GIMP2"
-if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != no ; then
- echo " Install plugin in home directory: $USER_INSTALL"
+if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
+ echo " Build enhanced Print plugin for the GIMP: yes"
+ echo " Build GIMP 1.2 plugin: $BUILD_GIMP"
+ echo " Build GIMP 2.x plugin: $BUILD_GIMP2"
+ if test "$BUILD_GIMP2" != "no" ; then
+ if test "$BUILD_GIMP2_AS_GUTENPRINT" != "no" ; then
+ echo " GIMP 2.x plugin will be named: gutenprint"
+ else
+ echo " GIMP 2.x plugin will be named: print"
+ fi
+ fi
+ echo " Install plugin(s) in home directory: $USER_INSTALL"
+else
+ echo " Build enhanced Print plugin for the GIMP: no"
fi
echo " Build EPSON Stylus utility: $BUILD_ESCPUTIL"
echo " Build test programs: $BUILD_TEST"
@@ -1049,10 +1067,9 @@ echo " Data directory: $PACKAGE_DATA_DIR"
echo " Library directory: $PACKAGE_LIB_DIR"
echo " XML data directory: $PKGXMLDATADIR"
echo " Module directory: $PKGMODULEDIR"
-echo " Install user guide: $INSTALL_USER_GUIDE"
echo " Install sample images: $INSTALL_SAMPLES"
echo
-echo "Configuration:"
+echo "General configuration:"
if test x$ac_compiler_gnu = "xyes"; then
echo " Compiler options: $CFLAGS $GNUCFLAGS"
else
@@ -1069,7 +1086,12 @@ if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
else
echo " Use readline libraries: $USE_READLINE"
fi
+echo "================================================================"
+if test $warnings_emitted -ne 0 ; then
+ echo
+ echo '*** NOTE: Please review the warnings shown above carefully!'
+fi
echo
-echo "Finished configuring."
-echo "Type 'make' to build the package"
+echo "Finished configuring. Please review the configuration summary above."
+echo "Type 'make clean' followed by 'make' to build the package"
echo "then 'make install' to install it."
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1874fd0..9920c97 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.45 2006/03/21 01:42:58 rlk Exp $
+## $Id: Makefile.am,v 1.48 2006/07/16 22:59:53 rlk Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,14 @@
@SET_MAKE@
-SUBDIRS = developer users_guide
+SUBDIRS = developer
include $(top_srcdir)/scripts/global.mk
## Variables
-docdir = $(datadir)/doc/$(PACKAGE)
+docdir = $(datadir)/$(PACKAGE)/doc
## Rules
@@ -51,19 +51,21 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure
docs: gutenprint-stamp
cd developer; $(MAKE)
- cd users_guide; $(MAKE)
ps: $(MANUAL).ps
cd developer; $(MAKE) ps
- cd users_guide; $(MAKE) ps
pdf: $(MANUAL).pdf
cd developer; $(MAKE) pdf
- cd users_guide; $(MAKE) pdf
html:
cd developer; $(MAKE) html
- cd users_guide; $(MAKE) html
+
+install-data-local: FAQ.html gutenprint-users-manual.odt gutenprint-users-manual.pdf
+ $(mkdir_p) $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) FAQ.html $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) gutenprint-users-manual.odt $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) gutenprint-users-manual.pdf $(DESTDIR)$(docdir)
## Clean
@@ -78,6 +80,8 @@ MAINTAINERCLEANFILES = \
EXTRA_DIST = \
FAQ.html \
README.maintaining \
+ gutenprint-users-manual.odt \
+ gutenprint-users-manual.pdf \
gutenprint.dox.in \
gutenprintui2.dox.in \
gutenprint \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ff3b448..53016ab 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -93,6 +93,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
@@ -313,9 +315,9 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = developer users_guide
+SUBDIRS = developer
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-docdir = $(datadir)/doc/$(PACKAGE)
+docdir = $(datadir)/$(PACKAGE)/doc
MAINTAINERCLEANFILES = \
Makefile.in \
gutenprint-stamp
@@ -323,6 +325,8 @@ MAINTAINERCLEANFILES = \
EXTRA_DIST = \
FAQ.html \
README.maintaining \
+ gutenprint-users-manual.odt \
+ gutenprint-users-manual.pdf \
gutenprint.dox.in \
gutenprintui2.dox.in \
gutenprint \
@@ -599,7 +603,7 @@ info: info-recursive
info-am:
-install-data-am:
+install-data-am: install-data-local
install-exec-am:
@@ -631,10 +635,10 @@ uninstall-info: uninstall-info-recursive
ctags ctags-recursive distclean distclean-generic \
distclean-libtool distclean-recursive distclean-tags distdir \
dvi dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
+ install-data install-data-am install-data-local install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-local maintainer-clean-recursive mostlyclean \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
@@ -675,19 +679,21 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure
docs: gutenprint-stamp
cd developer; $(MAKE)
- cd users_guide; $(MAKE)
ps: $(MANUAL).ps
cd developer; $(MAKE) ps
- cd users_guide; $(MAKE) ps
pdf: $(MANUAL).pdf
cd developer; $(MAKE) pdf
- cd users_guide; $(MAKE) pdf
html:
cd developer; $(MAKE) html
- cd users_guide; $(MAKE) html
+
+install-data-local: FAQ.html gutenprint-users-manual.odt gutenprint-users-manual.pdf
+ $(mkdir_p) $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) FAQ.html $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) gutenprint-users-manual.odt $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) gutenprint-users-manual.pdf $(DESTDIR)$(docdir)
maintainer-clean-local:
$(RM) -r gutenprint
diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
index 36b80d9..e93267c 100644
--- a/doc/developer/Makefile.am
+++ b/doc/developer/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.18 2005/11/22 14:43:04 rleigh Exp $
+## $Id: Makefile.am,v 1.19 2006/07/16 22:57:23 rlk Exp $
## Copyright (C) 2001 Andy Stewart and Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -38,9 +38,7 @@ MANUAL_SRC_FILES = \
HTMLDIR = reference-html
-if INSTALL_USER_GUIDE
STANDARD_TARGETS = html
-endif
DISTHOOKDIRS = $(HTMLDIR)
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index baa47fc..a86a76e 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -83,6 +83,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
@@ -317,7 +319,7 @@ MANUAL_SRC_FILES = \
weave.xml
HTMLDIR = reference-html
-@INSTALL_USER_GUIDE_TRUE@STANDARD_TARGETS = html
+STANDARD_TARGETS = html
DISTHOOKDIRS = $(HTMLDIR)
@MAINTAINER_MODE_FALSE@MAINT_MODE = false
@MAINTAINER_MODE_TRUE@MAINT_MODE = true
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index fef5abf..66a6479 100644
--- a/doc/developer/gutenprint.pdf
+++ b/doc/developer/gutenprint.pdf
Binary files differ
diff --git a/doc/developer/gutenprint.xml b/doc/developer/gutenprint.xml
index fe7f9a5..a5a3e9c 100644
--- a/doc/developer/gutenprint.xml
+++ b/doc/developer/gutenprint.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY copying SYSTEM "copying.xml">
<!ENTITY dither SYSTEM "dither.xml">
<!ENTITY escp2 SYSTEM "escp2.xml">
diff --git a/doc/gutenprint-users-manual.odt b/doc/gutenprint-users-manual.odt
new file mode 100644
index 0000000..618f1ba
--- /dev/null
+++ b/doc/gutenprint-users-manual.odt
Binary files differ
diff --git a/doc/gutenprint-users-manual.pdf b/doc/gutenprint-users-manual.pdf
new file mode 100644
index 0000000..7751497
--- /dev/null
+++ b/doc/gutenprint-users-manual.pdf
Binary files differ
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index 413385e..a11ecac 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -40,7 +40,7 @@
<tr><td class="indexkey"><a class="el" href="structstp__shade.html">stp_shade</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td><td class="indexvalue"></td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 1ca509f..fc037b0 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -54,7 +54,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Array functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index b3fb246..14cfefe 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -548,7 +548,7 @@ Bit operations.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index 44974eb..386984b 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -947,7 +947,7 @@ Channel functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 2f3d301..37cedf5 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -10,7 +10,7 @@
<tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
</td><td><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
</td><td><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__color.html">stp_color</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family.html">stp_family</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image.html">stp_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module.html">stp_module</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index b4f454a..d46f0ed 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -53,7 +53,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Color functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index c0ab451..0aaee7c 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -440,7 +440,7 @@ Curve caching functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 0caf28e..816e2e2 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -186,7 +186,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Curve functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index 61e49bb..fb08bd0 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -14,7 +14,7 @@
<dt>Global <a class="el" href="group__vars.html#ga37">stp_merge_printvars</a> </dt>
<dd>This is likely to go away.</dd>
</dl>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/dir_000000.html b/doc/gutenprint/html/dir_000000.html
index 7948f7e..173af1a 100644
--- a/doc/gutenprint/html/dir_000000.html
+++ b/doc/gutenprint/html/dir_000000.html
@@ -13,7 +13,7 @@
<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprint</a></td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/dir_000001.html b/doc/gutenprint/html/dir_000001.html
index 85c0fdc..e016d70 100644
--- a/doc/gutenprint/html/dir_000001.html
+++ b/doc/gutenprint/html/dir_000001.html
@@ -136,7 +136,7 @@
<p>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/dirs.html b/doc/gutenprint/html/dirs.html
index f65ec89..3635557 100644
--- a/doc/gutenprint/html/dirs.html
+++ b/doc/gutenprint/html/dirs.html
@@ -11,7 +11,7 @@
<li><a class="el" href="dir_000001.html">gutenprint</a>
</ul>
</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index fcedfa2..6daef41 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -1815,7 +1815,7 @@ Dither functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 47c0ce2..68167d4 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -32,7 +32,7 @@
<tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue">Softweave functions </td></tr>
<tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue">XML tree functions </td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index b43b16a..c8b0a5c 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -171,7 +171,7 @@ Here is a list of all struct and union fields with links to the structures/union
: <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
: <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
: <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index 362e67e..6560480 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -171,7 +171,7 @@
: <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
: <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
: <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 027e2cb..83862c8 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
<h3><a class="anchor" name="index__">- _ -</a></h3><ul>
<li>_
: <a class="el" href="group__intl.html#ga5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga5">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index efe1fa0..0905e93 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
<h3><a class="anchor" name="index_b">- b -</a></h3><ul>
<li>bindtextdomain
: <a class="el" href="group__intl.html#ga4">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga4">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index 0b605cf..b67d85d 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -17,7 +17,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
: <a class="el" href="curve-cache_8h.html#a2">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
: <a class="el" href="curve-cache_8h.html#a1">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
: <a class="el" href="curve-cache_8h.html#a0">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 70473b1..3785bf6 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -15,7 +15,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
<li>dcgettext
: <a class="el" href="group__intl.html#ga3">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga3">gutenprint-intl-internal.h</a><li>dgettext
: <a class="el" href="group__intl.html#ga2">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga2">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index 26575e7..901e25a 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
<h3><a class="anchor" name="index_g">- g -</a></h3><ul>
<li>gettext
: <a class="el" href="group__intl.html#ga1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga1">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index dbea7ab..ce57d20 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
<h3><a class="anchor" name="index_n">- n -</a></h3><ul>
<li>N_
: <a class="el" href="group__intl.html#ga6">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga6">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index 3716d6f..f1e5977 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -20,7 +20,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
: <a class="el" href="group__vars.html#gga137a33">vars.h</a><li>PARAMETER_INACTIVE
: <a class="el" href="group__vars.html#gga137a35">vars.h</a><li>PARAMETER_OK
: <a class="el" href="group__vars.html#gga137a34">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index d0e3ed8..bd82a10 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -640,7 +640,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
: <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
: <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
: <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index 17332e8..a8649c0 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -14,7 +14,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
<h3><a class="anchor" name="index_t">- t -</a></h3><ul>
<li>textdomain
: <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index 92a23c6..78a4995 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -88,7 +88,7 @@
<h3><a class="anchor" name="index_t">- t -</a></h3><ul>
<li>textdomain
: <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index 8350a00..947255f 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -24,7 +24,7 @@
: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_verify_t
: <a class="el" href="group__vars.html#ga137">vars.h</a><li>stp_weave_strategy_t
: <a class="el" href="weave_8h.html#a26">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index d2d94ee..4afbdda 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -76,7 +76,7 @@
: <a class="el" href="weave_8h.html#a26a13">weave.h</a><li>STP_WEAVE_STAGGERED
: <a class="el" href="weave_8h.html#a26a15">weave.h</a><li>STP_WEAVE_ZIGZAG
: <a class="el" href="weave_8h.html#a26a11">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index dd9a1d1..3526f2b 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -470,7 +470,7 @@
: <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
: <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
: <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index 829c405..c309542 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -55,7 +55,7 @@
: <a class="el" href="string-list_8h.html#a0">string-list.h</a><li>stp_vars_t
: <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_xml_parse_func
: <a class="el" href="xml_8h.html#a0">xml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index bee2dca..fe095f5 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -22,7 +22,7 @@
: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>stp_pack_tiff
: <a class="el" href="weave_8h.html#a5">weave.h</a><li>stp_pack_uncompressed
: <a class="el" href="weave_8h.html#a6">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index df6ccbc..252b81e 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -600,7 +600,7 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 6c5eec8..014ddac 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -497,7 +497,7 @@ Get a color module by its name.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index d6b93ac..f97133e 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -2463,7 +2463,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index fadf28c..08883eb 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -346,7 +346,7 @@ An error occured, or the job was aborted. </td></tr>
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index a34473c..86a6370 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -236,7 +236,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index fd6d28c..32e2e8e 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -236,7 +236,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index c14ff84..8f82f9d 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -1305,7 +1305,7 @@ This callback function will be called to determine the sort order for list items
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index f2d4c14..51d70fc 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -270,7 +270,7 @@ Get the number of available papersizes.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 1d8c9aa..916581a 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -990,7 +990,7 @@ Start a print job.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index 333f5fa..f411bd8 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -1477,7 +1477,7 @@ Set the data in a sequence from unsigned short values.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index ccb108c..410d19e 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -1828,7 +1828,7 @@ This function sets the encoding that all strings translated by gettext are outpu
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index d98ce3b..06684d5 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -6659,7 +6659,7 @@ Verify that the parameters selected are consistent with those allowed by the dri
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index 50e4153..e81969b 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -434,7 +434,7 @@ The library minor version number.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
index 4b9c33d..76db8ae 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -31,7 +31,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Internationalisation functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index 8b0eb1c..ed539ef 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -31,7 +31,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Internationalisation functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index c17edae..f2a5182 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -52,7 +52,7 @@ This header includes all of the public headers used by modules.<hr><h2>Define Do
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index e58b6a1..7b8db20 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -53,7 +53,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Version functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 5e90dce..e1d25c0 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -27,7 +27,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Gutenprint master header.
<p>
-This header includes all of the public headers.<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+This header includes all of the public headers.<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index 7fc81d0..9c02bfb 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -47,7 +47,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Image functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 76a01f3..792a2d4 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -7,7 +7,7 @@
<div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
<h1>libgutenprint API Reference Documentation</h1>
<p>
-<h3 align="center">5.0.0-rc3 </h3><hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<h3 align="center">5.0.0 </h3><hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index b3b2de4..3fc29d4 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -113,7 +113,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Generic list functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index e83f397..71de66f 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -304,7 +304,7 @@ Module functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index 5f5639b..c416a72 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -20,7 +20,7 @@
<li><a class="el" href="group__util.html">util</a>
<li><a class="el" href="group__vars.html">vars</a>
</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 90aa0ae..9321a1a 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -1360,7 +1360,7 @@ Mini-XML XML parsing functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index e969ca8..5f0d006 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -9,7 +9,7 @@
<li><a class="el" href="deprecated.html">Deprecated List</a>
</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index d2314d2..f0dce9d 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -43,7 +43,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Paper size functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index 3e6ec1d..b6695d0 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -95,7 +95,7 @@ Simple directory path functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index d5bdf25..4d31c1b 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -93,7 +93,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Printer functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index 2d5f018..e14282e 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -104,7 +104,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Sequence functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 73491b2..29a2ed7 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -411,7 +411,7 @@ The string_list opaque data type.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index f891c64..b418e8a 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -389,7 +389,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html
index 57c2a8a..de6dd12 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -114,7 +114,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index 85e7926..7aa0850 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -92,7 +92,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index c383ca9..4dd7910 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -117,7 +117,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html
index 01259d8..6fa7387 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -79,7 +79,7 @@ Vertical position.
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html
index fb6f930..d4c8094 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -139,7 +139,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html
index 7aea8ad..e5063d4 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -139,7 +139,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html
index daf45fe..cace20f 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -139,7 +139,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index e86eafb..70c1fd3 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html
index 6f15622..0e57b02 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -73,7 +73,7 @@ Upper bound. </td>
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index 60db122..589aaaf 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -67,7 +67,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index 07c1f55..75688f4 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -278,7 +278,7 @@ This callback returns the width of the image in pixels.
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="image_8h.html">image.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html
index 12cfe54..ba41b09 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -73,7 +73,7 @@ Upper bound. </td>
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index 9412037..47b4310 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index e5e3a6d..e20e95b 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -89,7 +89,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index 73caa9f..ba550f4 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index d28cb24..49a9ffe 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index e07263c..21a468f 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index 72e83e5..88a1a3c 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -214,7 +214,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index e5891d2..6853cf4 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html
index fb4ead4..8c31201 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html
index 543372a..a59df42 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -189,7 +189,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html
index 951c0a6..719a0cc 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -64,7 +64,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html
index 29f41e0..5132428 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -89,7 +89,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index d8996b2..469dcd0 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -303,7 +303,7 @@ Paper width.
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html
index 47ef8ff..0550248 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -72,7 +72,7 @@ Human-readable (translated) text. </td>
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index 2f91771..bbc3639 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -702,7 +702,7 @@ Should the verify system check this parameter? </td>
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index 7b0451a..93eb7a7 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -164,7 +164,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index 3dd2908..c25ce18 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -317,7 +317,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index d2b01b1..76b5543 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -73,7 +73,7 @@ Raw data. </td>
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index 47ca7b0..3d18aed 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -89,7 +89,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index f15fbde..1858218 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -189,7 +189,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
index b3ad3e3..77c68e9 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -139,7 +139,7 @@
</table>
<hr>The documentation for this union was generated from the following file:<ul>
<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index eb59f6c..cdd5950 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -133,7 +133,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Utility functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index d9adc56..e92ef23 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -473,7 +473,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Print job functions.
<p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index 27e9bc9..ee16009 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -815,7 +815,7 @@ Softweave functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index 4b53ee1..6c675cb 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -693,7 +693,7 @@ XML tree functions.
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index 017a48b..6ecab33 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -13,7 +13,7 @@
<tr><td class="indexkey"><a class="el" href="structstpui__image.html">stpui_image</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td><td class="indexvalue"></td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 5ceab0b..1f4a791 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -10,7 +10,7 @@
<tr><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
</td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter__">_</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index 78675a6..6d35ca1 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -603,7 +603,7 @@
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/dir_000000.html b/doc/gutenprintui2/html/dir_000000.html
index 152aa31..213b38e 100644
--- a/doc/gutenprintui2/html/dir_000000.html
+++ b/doc/gutenprintui2/html/dir_000000.html
@@ -13,7 +13,7 @@
<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprintui2</a></td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/dir_000001.html b/doc/gutenprintui2/html/dir_000001.html
index 8b622f5..71482db 100644
--- a/doc/gutenprintui2/html/dir_000001.html
+++ b/doc/gutenprintui2/html/dir_000001.html
@@ -19,7 +19,7 @@
<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html
index 409002d..1c1d725 100644
--- a/doc/gutenprintui2/html/dirs.html
+++ b/doc/gutenprintui2/html/dirs.html
@@ -11,7 +11,7 @@
<li><a class="el" href="dir_000001.html">gutenprintui2</a>
</ul>
</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index 9b79775..6b43d6e 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -11,7 +11,7 @@
<tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey">include/gutenprintui2/<a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td><td class="indexvalue"></td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index f8078ed..b627e8d 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -98,7 +98,7 @@ Here is a list of all struct and union fields with links to the structures/union
: <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
: <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
: <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 2ce7df9..63899e4 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -98,7 +98,7 @@
: <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
: <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
: <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index 7dd92b5..a8d5989 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -308,7 +308,7 @@
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index add5e7c..adf0dc1 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -119,7 +119,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
: <a class="el" href="curve_8h.html#a19">curve.h</a><li>StpuiGammaCurve
: <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
: <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index cb7913a..ba1718a 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -25,7 +25,7 @@
: <a class="el" href="typebuiltins_8h.html#a2">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
: <a class="el" href="gammacurve_8h.html#a0">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
: <a class="el" href="typebuiltins_8h.html#a0">typebuiltins.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index b2fc034..fb8fc83 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -13,7 +13,7 @@
: <a class="el" href="gutenprintui_8h.html#a63">gutenprintui.h</a><li>orient_t
: <a class="el" href="gutenprintui_8h.html#a62">gutenprintui.h</a><li>StpuiCurveType
: <a class="el" href="curve_8h.html#a19">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 00d0366..443806c 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -21,7 +21,7 @@
: <a class="el" href="curve_8h.html#a19a10">curve.h</a><li>STPUI_CURVE_TYPE_LINEAR
: <a class="el" href="curve_8h.html#a19a8">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
: <a class="el" href="curve_8h.html#a19a9">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 6867abf..0b9edef 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -82,7 +82,7 @@
: <a class="el" href="gutenprintui_8h.html#a39">gutenprintui.h</a><li>stpui_set_thumbnail_data()
: <a class="el" href="gutenprintui_8h.html#a59">gutenprintui.h</a><li>stpui_set_thumbnail_func()
: <a class="el" href="gutenprintui_8h.html#a57">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index d29c3c9..0c48088 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -16,7 +16,7 @@
: <a class="el" href="curve_8h.html#a7">curve.h</a><li>StpuiGammaCurve
: <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
: <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index e1c0072..178e3cf 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -1946,7 +1946,7 @@
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index d132c22..71df013 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -7,7 +7,7 @@
<div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>libgutenprintui2 API Reference Documentation</h1>
<p>
-<h3 align="center">5.0.0-rc3 </h3><hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<h3 align="center">5.0.0 </h3><hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index 80ea194..7333407 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -389,7 +389,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index d87d58e..ef2dfea 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -164,7 +164,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index 896199c..c0396c3 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -189,7 +189,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index 2276c7d..efba469 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -139,7 +139,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index c4a97e6..9b6b9d7 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -214,7 +214,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index 78727a8..58cf74b 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -339,7 +339,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index 974b9c8..4b51f32 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -180,7 +180,7 @@
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sun May 14 12:15:57 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
</body>
diff --git a/doc/users_guide/Makefile.am b/doc/users_guide/Makefile.am
deleted file mode 100644
index f8636af..0000000
--- a/doc/users_guide/Makefile.am
+++ /dev/null
@@ -1,543 +0,0 @@
-## $Id: Makefile.am,v 1.44 2005/11/22 14:43:04 rleigh Exp $
-## Copyright (C) 2001 Andy Stewart and Roger Leigh
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-## Process this file with automake to produce Makefile.in.
-
-@SET_MAKE@
-
-include $(top_srcdir)/scripts/global.mk
-
-
-## Variables
-
-EPSLEVEL = 2
-
-UTIL_MANUAL = util-edition
-UTIL_MANUAL_SRC_FILES = $(srcdir)/$(UTIL_MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/utils.sgml \
- $(srcdir)/gfdl.sgml
-
-GIMP_MANUAL = gimp-edition
-GIMP_MANUAL_SRC_FILES = $(srcdir)/$(GIMP_MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/gimp.sgml \
- $(srcdir)/gfdl.sgml
-
-CUPS_MANUAL = cups-edition
-CUPS_MANUAL_SRC_FILES = $(srcdir)/$(CUPS_MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/cups.sgml \
- $(srcdir)/gfdl.sgml
-
-MANUAL = users-guide
-MANUAL_SRC_FILES = $(srcdir)/$(MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/gimp.sgml \
- $(srcdir)/cups.sgml \
- $(srcdir)/utils.sgml \
- $(srcdir)/gfdl.sgml
-
-UTIL_HTMLDIR = util_html
-GIMP_HTMLDIR = gimp_html
-CUPS_HTMLDIR = cups_html
-HTMLDIR = html
-
-UTIL_OUTPUTS = \
- $(UTIL_MANUAL).pdf \
- util_html
-
-GIMP_OUTPUTS = \
- $(GIMP_MANUAL).pdf \
- gimp_html
-
-CUPS_OUTPUTS = \
- $(CUPS_MANUAL).pdf \
- cups_html
-
-OUTPUTS = \
- $(MANUAL).pdf \
- html
-
-UTIL_GUIDE = $(UTIL_MANUAL).pdf util_html
-GIMP_GUIDE = $(GIMP_MANUAL).pdf gimp_html
-CUPS_GUIDE = $(CUPS_MANUAL).pdf cups_html
-USER_GUIDE = $(MANUAL).pdf html
-
-if INSTALL_USER_GUIDE
-STANDARD_TARGETS = $(USER_GUIDE)
-endif
-
-DISTHOOKDIRS = $(HTMLDIR)/stylesheet-images
-
-UTIL_PNG_IMAGES =
-
-CUPS_PNG_IMAGES = \
- figures/cups_admin.png \
- figures/cups_admin_device.png \
- figures/cups_admin_make.png \
- figures/cups_admin_model.png \
- figures/cups_admin_success.png \
- figures/cups_config_printer.png \
- figures/cups_my_printer.png \
- figures/cups_printers.png \
- figures/cups_startup.png
-
-GIMP_PNG_IMAGES = \
- figures/gimp-print-gui-1.png \
- figures/gimp-print-gui.png \
- figures/gimp-print-new-printer.png \
- figures/gimp-print-print-color-adjust.png \
- figures/gimp-print-setup.png \
- figures/gimp_image.png \
- figures/gimp_startup.png
-
-PNG_IMAGES = \
- $(CUPS_PNG_IMAGES) \
- $(GIMP_PNG_IMAGES)
-
-DISTHOOKFILES = $(PNG_IMAGES) $(STANDARD_TARGETS) $(HTMLDIR)/*.html $(HTMLDIR)/*.css
-
-UTIL_EPS_IMAGES = $(addsuffix .eps,$(basename $(UTIL_PNG_IMAGES)))
-GIMP_EPS_IMAGES = $(addsuffix .eps,$(basename $(GIMP_PNG_IMAGES)))
-CUPS_EPS_IMAGES = $(addsuffix .eps,$(basename $(CUPS_PNG_IMAGES)))
-EPS_IMAGES = $(addsuffix .eps,$(basename $(PNG_IMAGES)))
-
-if MAINTAINER_MODE
-MAINT_MODE = true
-else
-MAINT_MODE = false
-endif
-
-if MAINTAINER_MODE
-ALL_LOCAL_TARGETS = docs
-else
-ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
-endif
-
-## Rules
-
-dist-hook: $(USER_GUIDE)
- for file in $(DISTHOOKFILES) ; do \
- if test -f $$file ; then \
- if ! test -d $(distdir)/`dirname $$file` ; then \
- mkdir $(distdir)/`dirname $$file` ; \
- fi ; \
- cp -p $$file $(distdir)/`dirname $$file` ; \
- fi ; \
- done
- for dir in $(DISTHOOKDIRS) ; do \
- if test -d $(srcdir)/$$dir ; then \
- mkdir $(distdir)/$$dir; \
- for dirfile in $(srcdir)/$$dir/*; do \
- if test -f $$dirfile ; then \
- cp -p $$dirfile $(distdir)/$$dir ; \
- fi ; \
- if test -d $$dirfile ; then \
- cp -pR $$dirfile $(distdir)/$$dir ; \
- fi ; \
- done \
- fi \
- done
-
-$(UTIL_MANUAL).pdf: $(UTIL_MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- fi ; \
- $(DB2PDF) $(UTIL_MANUAL).sgml
-
-$(GIMP_MANUAL).pdf: $(GIMP_MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
- cp -p $$image figures/`basename $$image` ; \
- done ; \
- fi ; \
- $(DB2PDF) $(GIMP_MANUAL).sgml
-
-$(CUPS_MANUAL).pdf: $(CUPS_MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
- cp -p $$image figures/`basename $$image` ; \
- done ; \
- fi ; \
- $(DB2PDF) $(CUPS_MANUAL).sgml
-
-$(MANUAL).pdf: $(MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
- cp -p $$image figures/`basename $$image` ; \
- done ; \
- fi ; \
- $(DB2PDF) $(MANUAL).sgml
-
-editions: docs cups_docs gimp_docs util_docs
-
-util_docs: util_html util_pdf
-gimp_docs: gimp_html gimp_pdf
-cups_docs: cups_html cups_pdf
-docs: html pdf
-
-all_util_docs: util_html util_ps util_pdf
-all_gimp_docs: gimp_html gimp_ps gimp_pdf
-all_cups_docs: cups_html cups_ps cups_pdf
-all_docs: html ps pdf
-
-all-local: $(ALL_LOCAL_TARGETS)
-
-util_pdf: $(UTIL_MANUAL).pdf
-gimp_pdf: $(GIMP_MANUAL).pdf
-cups_pdf: $(CUPS_MANUAL).pdf
-pdf: $(MANUAL).pdf
-
-util_ps: $(UTIL_MANUAL).ps
-gimp_ps: $(GIMP_MANUAL).ps
-cups_ps: $(CUPS_MANUAL).ps
-ps: $(MANUAL).ps
-
-$(UTIL_MANUAL).ps: $(UTIL_MANUAL_SRC_FILES) $(UTIL_EPS_IMAGES)
- for i in $(UTIL_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(UTIL_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(UTIL_MANUAL)-eps.sgml
- $(DB2PS) $(UTIL_MANUAL)-eps.sgml
- mv $(UTIL_MANUAL)-eps.ps $(UTIL_MANUAL).ps
- for i in $(UTIL_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-$(GIMP_MANUAL).ps: $(GIMP_MANUAL_SRC_FILES) $(GIMP_EPS_IMAGES)
- for i in $(GIMP_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(GIMP_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(GIMP_MANUAL)-eps.sgml
- $(DB2PS) $(GIMP_MANUAL)-eps.sgml
- mv $(GIMP_MANUAL)-eps.ps $(GIMP_MANUAL).ps
- for i in $(GIMP_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-$(CUPS_MANUAL).ps: $(CUPS_MANUAL_SRC_FILES) $(CUPS_EPS_IMAGES)
- for i in $(CUPS_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(CUPS_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(CUPS_MANUAL)-eps.sgml
- $(DB2PS) $(CUPS_MANUAL)-eps.sgml
- mv $(CUPS_MANUAL)-eps.ps $(CUPS_MANUAL).ps
- for i in $(CUPS_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-$(MANUAL).ps: $(MANUAL_SRC_FILES) $(EPS_IMAGES)
- for i in $(MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(MANUAL)-eps.sgml
- $(DB2PS) $(MANUAL)-eps.sgml
- mv $(MANUAL)-eps.ps $(MANUAL).ps
- for i in $(MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-%.eps:
- if test ! -d figures ; then mkdir figures ; fi
- $(CONVERT) $(srcdir)/$(basename $@).png EPS$(EPSLEVEL):$@
-
-util_html: util-html-stamp
-gimp_html: gimp-html-stamp
-cups_html: cups-html-stamp
-html: html-stamp
-
-# This ugly workaround with SOURCE is because db2html doesn't seem to like
-# "./users-guide.sgml". Note that db2ps does not have the same limitation.
-# html-stamp should *only* be called by html--it's just a timestamp!
-
-util-html-stamp: $(UTIL_MANUAL_SRC_FILES) $(UTIL_PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(UTIL_MANUAL).sgml
- -$(RM) -rf $(UTIL_HTMLDIR)
- mv $(UTIL_MANUAL) $(UTIL_HTMLDIR)
- chmod a+rx $(UTIL_HTMLDIR)
- touch util-html-stamp
-
-gimp-html-stamp: $(GIMP_MANUAL_SRC_FILES) $(GIMP_PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(GIMP_MANUAL).sgml
- -mkdir $(GIMP_MANUAL)/figures
- for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
- cp -p $$image $(GIMP_MANUAL)/figures/`basename $$image` ; \
- done
- -$(RM) -rf $(GIMP_HTMLDIR)
- mv $(GIMP_MANUAL) $(GIMP_HTMLDIR)
- chmod a+rx $(GIMP_HTMLDIR)
- touch gimp-html-stamp
-
-cups-html-stamp: $(CUPS_MANUAL_SRC_FILES) $(CUPS_PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(CUPS_MANUAL).sgml
- -mkdir $(CUPS_MANUAL)/figures
- for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
- cp -p $$image $(CUPS_MANUAL)/figures/`basename $$image` ; \
- done
- -$(RM) -rf $(CUPS_HTMLDIR)
- mv $(CUPS_MANUAL) $(CUPS_HTMLDIR)
- chmod a+rx $(CUPS_HTMLDIR)
- touch cups-html-stamp
-
-html-stamp: $(MANUAL_SRC_FILES) $(PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(MANUAL).sgml
- -mkdir $(MANUAL)/figures
- for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
- cp -p $$image $(MANUAL)/figures/`basename $$image` ; \
- done
- -$(RM) -rf $(HTMLDIR)
- mv $(MANUAL) $(HTMLDIR)
- chmod a+rx $(HTMLDIR)
- touch html-stamp
-
-install-data-local: $(STANDARD_TARGETS)
- if test -n '$(STANDARD_TARGETS)' ; then \
- $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
- $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
- if test -f $(MANUAL).pdf ; then \
- $(INSTALL_DATA) $(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
- elif test -f $(srcdir)/$(MANUAL).pdf ; then \
- $(INSTALL_DATA) $(srcdir)/$(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
- fi ; \
- if test -d $(HTMLDIR) ; then \
- HTMLGENDIR="$(HTMLDIR)" ; \
- elif test -d $(srcdir)/$(HTMLDIR) ; then \
- HTMLGENDIR="$(srcdir)/$(HTMLDIR)" ; \
- else \
- exit 1 ; \
- fi ; \
- for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
- if test -f $$file ; then \
- $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html ; \
- fi ; \
- done ; \
- for file in $(srcdir)/figures/*.png ; do \
- if test -f $$file ; then \
- $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
- fi ; \
- done ; \
- if test -d $$HTMLGENDIR/stylesheet-images ; then \
- for file in $$HTMLGENDIR/stylesheet-images/* ; do \
- if test -f $$file ; then \
- $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
- fi ; \
- done ; \
- fi ; \
- fi
-
-uninstall-local:
- -$(RM) -r $(DESTDIR)$(datadir)/$(PACKAGE)/doc
-
-CLEAN_MANUALS = \
- $(RM) -f $(MANUAL).pdf $(MANUAL).ps ; \
- $(RM) -f $(CUPS_MANUAL).pdf $(CUPS_MANUAL).ps ; \
- $(RM) -f $(GIMP_MANUAL).pdf $(GIMP_MANUAL).ps ; \
- $(RM) -f $(UTIL_MANUAL).pdf $(UTIL_MANUAL).ps ; \
- $(RM) -rf *html-stamp $(HTMLDIR) $(CUPS_HTMLDIR) $(GIMP_HTMLDIR) $(UTIL_HTMLDIR) ; \
- $(RM) -f $(EPS_IMAGES) $(CUPS_EPS_IMAGES) $(GIMP_EPS_IMAGES) $(UTIL_EPS_IMAGES)
-
-clean-local:
- if test $(srcdir) = "." -a $(MAINT_MODE) = false ; then \
- echo "clean-local: Not removing $(HTMLDIR)" ; \
- echo 'clean-local: Not removing $(MANUAL).pdf' ; \
- echo 'clean-local: Not removing $(MANUAL).ps' ; \
- echo 'clean-local: Not removing EPS figures' ; \
- else \
- $(CLEAN_MANUALS) ; \
- fi
- if test $(srcdir) = "." ; then \
- : ; \
- else \
- $(RM) -f $(MANUAL_SRC_FILES) $(CUPS_MANUAL_SRC_FILES) ; \
- $(RM) -f $(GIMP_MANUAL_SRC_FILES) $(UTIL_CUPS_MANUAL_SRC_FILES) ; \
- $(RM) -rf figures ; \
- fi
- -$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
- -$(RM) -rf db2html* DB2HTML*
-
-veryclean:
- $(MAKE) MAINT_MODE=true clean
-
-maintainer-clean-local:
- $(CLEAN_MANUALS)
-
-#
-# This is my (so far failed) attempt to create an index for this documentation.
-#
-#
-#index.sgml:
-# $(PERL) /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -N -o index.sgml
-#
-# $(JADE) -V html-index \
-# -t sgml \
-# -c /usr/share/sgml/CATALOG.jade_dsl \
-# -c /usr/share/sgml/CATALOG.docbook-dsssl-stylesheets \
-# -c /usr/share/sgml/CATALOG.gnome \
-# -c /usr/share/sgml/CATALOG.docbook_4 \
-# -c /usr/share/sgml/CATALOG.docbook_3 \
-# -D /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64 \
-# -d /usr/share/sgml/docbook-toys/suse-both.dsl \
-# -o index.sgml \
-# gimp-print-users-guide-4.1.99-b3.sgml
-#
-#
-# END failed attempt at index creation.
-#
-
-help:
- @echo " "
- @echo "Targets for the complete user's guide:"
- @echo " "
- @echo " docs - creates PS, PDF, and HTML documentation files"
- @echo " all_docs - creates PS and HTML documentation files"
- @echo " ps - creates PostScript documentation"
- @echo " pdf - creates PDF documentation"
- @echo " html - creates HTML documentation"
- @echo " clean - deletes machine generated files, but not outputs"
- @echo " veryclean - deletes output files in addition"
- @echo " help - prints this help text"
- @echo ""
- @echo "Targets for specific manual editions:"
- @echo " "
- @echo " cups_html - generate HTML for CUPS edition of the manual"
- @echo " cups_pdf - generate PDF for CUPS edition of the manual"
- @echo " cups_ps - generate PS for CUPS edition of the manual"
- @echo " "
- @echo " gimp_docs - generate HTML, PDF, and PS for GIMP edition of the manual"
- @echo " gimp_html - generate HTML for GIMP edition of the manual"
- @echo " gimp_pdf - generate PDF for GIMP edition of the manual"
- @echo " gimp_ps - generate PS for GIMP edition of the manual"
- @echo " "
- @echo " util_docs - generate HTML, PDF, and PS for UTIL edition of the manual"
- @echo " util_html - generate HTML for UTIL edition of the manual"
- @echo " util_pdf - generate PDF for UTIL edition of the manual"
- @echo " util_ps - generate PS for UTIL edition of the manual"
- @echo " "
- @echo " editions - generates HTML, PDF, and PS for ALL editions of the manual"
- @echo " "
-
-
-## Clean
-
-MAINTAINERCLEANFILES = Makefile.in *html-stamp
-
-
-EXTRA_DIST = README \
- $(MANUAL_SRC_FILES) \
- html-stamp \
- cups-edition.sgml \
- gimp-edition.sgml \
- util-edition.sgml
-
-.PHONY: docs cups_docs gimp_docs util_docs
-.PHONY: all_docs all_cups_docs all_gimp_docs all_util_docs
-.PHONY: html cups_html gimp_html util_html
-.PHONY: ps cups_ps gimp_ps util_ps
-.PHONY: pdf cups_pdf gimp_pdf util_pdf
-.PHONY: help
diff --git a/doc/users_guide/Makefile.in b/doc/users_guide/Makefile.in
deleted file mode 100644
index fedd86c..0000000
--- a/doc/users_guide/Makefile.in
+++ /dev/null
@@ -1,980 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Variables
-
-#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/scripts/global.mk
-subdir = doc/users_guide
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
- $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
- $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
-BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
-BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
-BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
-BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
-BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
-BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
-BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
-BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
-BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
-BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
-BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
-BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CONVERT = @CONVERT@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CUPS_CFLAGS = @CUPS_CFLAGS@
-CUPS_CONFIG = @CUPS_CONFIG@
-CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
-CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DB2HTML = @DB2HTML@
-DB2PDF = @DB2PDF@
-DB2PS = @DB2PS@
-DEFS = @DEFS@
-DIALOG = @DIALOG@
-DOXYGEN = @DOXYGEN@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FIND = @FIND@
-FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
-GENPPD_LIBS = @GENPPD_LIBS@
-GIMP2_CFLAGS = @GIMP2_CFLAGS@
-GIMP2_LIBS = @GIMP2_LIBS@
-GIMPTOOL = @GIMPTOOL@
-GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
-GIMPTOOL_CHECK = @GIMPTOOL_CHECK@
-GIMP_CFLAGS = @GIMP_CFLAGS@
-GIMP_CFLAGS_NOUI = @GIMP_CFLAGS_NOUI@
-GIMP_DATA_DIR = @GIMP_DATA_DIR@
-GIMP_LIBS = @GIMP_LIBS@
-GIMP_LIBS_NOUI = @GIMP_LIBS_NOUI@
-GIMP_PLUGIN_DIR = @GIMP_PLUGIN_DIR@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GNUCFLAGS = @GNUCFLAGS@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
-GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
-GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
-GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
-GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
-GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
-GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
-GUTENPRINTUI_BINARY_AGE = @GUTENPRINTUI_BINARY_AGE@
-GUTENPRINTUI_CFLAGS = @GUTENPRINTUI_CFLAGS@
-GUTENPRINTUI_CURRENT_INTERFACE = @GUTENPRINTUI_CURRENT_INTERFACE@
-GUTENPRINTUI_INTERFACE_AGE = @GUTENPRINTUI_INTERFACE_AGE@
-GUTENPRINTUI_LIBDEPS = @GUTENPRINTUI_LIBDEPS@
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
-GUTENPRINTUI_VERSION = @GUTENPRINTUI_VERSION@
-GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
-GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
-GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
-GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
-GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
-
-# Libraries
-GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
-GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
-GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
-GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
-GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
-IJS_CFLAGS = @IJS_CFLAGS@
-IJS_CONFIG = @IJS_CONFIG@
-IJS_LIBS = @IJS_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
-LIBS = $(INTLLIBS) @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTALLOCA = @LTALLOCA@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-PLUG_IN_PATH = @PLUG_IN_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-RELEASE_DATE = @RELEASE_DATE@
-RM = @RM@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
-USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
-VERSION = @VERSION@
-WHICH_PPDS = @WHICH_PPDS@
-XGETTEXT = @XGETTEXT@
-YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-cups_bindir = @cups_bindir@
-cups_conf_datadir = @cups_conf_datadir@
-cups_conf_serverbin = @cups_conf_serverbin@
-cups_conf_serverroot = @cups_conf_serverroot@
-cups_exec_prefix = @cups_exec_prefix@
-cups_prefix = @cups_prefix@
-cups_sbindir = @cups_sbindir@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-gimp2_plug_indir = @gimp2_plug_indir@
-gimp_plug_indir = @gimp_plug_indir@
-gutenprint_cflags = @gutenprint_cflags@
-gutenprint_libdeps = @gutenprint_libdeps@
-gutenprint_libs = @gutenprint_libs@
-gutenprintui2_cflags = @gutenprintui2_cflags@
-gutenprintui2_libdeps = @gutenprintui2_libdeps@
-gutenprintui2_libs = @gutenprintui2_libs@
-gutenprintui_cflags = @gutenprintui_cflags@
-gutenprintui_libdeps = @gutenprintui_libdeps@
-gutenprintui_libs = @gutenprintui_libs@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-EPSLEVEL = 2
-UTIL_MANUAL = util-edition
-UTIL_MANUAL_SRC_FILES = $(srcdir)/$(UTIL_MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/utils.sgml \
- $(srcdir)/gfdl.sgml
-
-GIMP_MANUAL = gimp-edition
-GIMP_MANUAL_SRC_FILES = $(srcdir)/$(GIMP_MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/gimp.sgml \
- $(srcdir)/gfdl.sgml
-
-CUPS_MANUAL = cups-edition
-CUPS_MANUAL_SRC_FILES = $(srcdir)/$(CUPS_MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/cups.sgml \
- $(srcdir)/gfdl.sgml
-
-MANUAL = users-guide
-MANUAL_SRC_FILES = $(srcdir)/$(MANUAL).sgml \
- $(srcdir)/title.sgml \
- $(srcdir)/history.sgml \
- $(srcdir)/gimp.sgml \
- $(srcdir)/cups.sgml \
- $(srcdir)/utils.sgml \
- $(srcdir)/gfdl.sgml
-
-UTIL_HTMLDIR = util_html
-GIMP_HTMLDIR = gimp_html
-CUPS_HTMLDIR = cups_html
-HTMLDIR = html
-UTIL_OUTPUTS = \
- $(UTIL_MANUAL).pdf \
- util_html
-
-GIMP_OUTPUTS = \
- $(GIMP_MANUAL).pdf \
- gimp_html
-
-CUPS_OUTPUTS = \
- $(CUPS_MANUAL).pdf \
- cups_html
-
-OUTPUTS = \
- $(MANUAL).pdf \
- html
-
-UTIL_GUIDE = $(UTIL_MANUAL).pdf util_html
-GIMP_GUIDE = $(GIMP_MANUAL).pdf gimp_html
-CUPS_GUIDE = $(CUPS_MANUAL).pdf cups_html
-USER_GUIDE = $(MANUAL).pdf html
-@INSTALL_USER_GUIDE_TRUE@STANDARD_TARGETS = $(USER_GUIDE)
-DISTHOOKDIRS = $(HTMLDIR)/stylesheet-images
-UTIL_PNG_IMAGES =
-CUPS_PNG_IMAGES = \
- figures/cups_admin.png \
- figures/cups_admin_device.png \
- figures/cups_admin_make.png \
- figures/cups_admin_model.png \
- figures/cups_admin_success.png \
- figures/cups_config_printer.png \
- figures/cups_my_printer.png \
- figures/cups_printers.png \
- figures/cups_startup.png
-
-GIMP_PNG_IMAGES = \
- figures/gimp-print-gui-1.png \
- figures/gimp-print-gui.png \
- figures/gimp-print-new-printer.png \
- figures/gimp-print-print-color-adjust.png \
- figures/gimp-print-setup.png \
- figures/gimp_image.png \
- figures/gimp_startup.png
-
-PNG_IMAGES = \
- $(CUPS_PNG_IMAGES) \
- $(GIMP_PNG_IMAGES)
-
-DISTHOOKFILES = $(PNG_IMAGES) $(STANDARD_TARGETS) $(HTMLDIR)/*.html $(HTMLDIR)/*.css
-UTIL_EPS_IMAGES = $(addsuffix .eps,$(basename $(UTIL_PNG_IMAGES)))
-GIMP_EPS_IMAGES = $(addsuffix .eps,$(basename $(GIMP_PNG_IMAGES)))
-CUPS_EPS_IMAGES = $(addsuffix .eps,$(basename $(CUPS_PNG_IMAGES)))
-EPS_IMAGES = $(addsuffix .eps,$(basename $(PNG_IMAGES)))
-@MAINTAINER_MODE_FALSE@MAINT_MODE = false
-@MAINTAINER_MODE_TRUE@MAINT_MODE = true
-@MAINTAINER_MODE_FALSE@ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
-@MAINTAINER_MODE_TRUE@ALL_LOCAL_TARGETS = docs
-CLEAN_MANUALS = \
- $(RM) -f $(MANUAL).pdf $(MANUAL).ps ; \
- $(RM) -f $(CUPS_MANUAL).pdf $(CUPS_MANUAL).ps ; \
- $(RM) -f $(GIMP_MANUAL).pdf $(GIMP_MANUAL).ps ; \
- $(RM) -f $(UTIL_MANUAL).pdf $(UTIL_MANUAL).ps ; \
- $(RM) -rf *html-stamp $(HTMLDIR) $(CUPS_HTMLDIR) $(GIMP_HTMLDIR) $(UTIL_HTMLDIR) ; \
- $(RM) -f $(EPS_IMAGES) $(CUPS_EPS_IMAGES) $(GIMP_EPS_IMAGES) $(UTIL_EPS_IMAGES)
-
-MAINTAINERCLEANFILES = Makefile.in *html-stamp
-EXTRA_DIST = README \
- $(MANUAL_SRC_FILES) \
- html-stamp \
- cups-edition.sgml \
- gimp-edition.sgml \
- util-edition.sgml
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps doc/users_guide/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps doc/users_guide/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../scripts
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
- maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf-am:
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
- clean-libtool clean-local dist-hook distclean \
- distclean-generic distclean-libtool distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-local mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-local
-
-
-@SET_MAKE@
-
-# Rules
-
-$(top_builddir)/src/main/libgutenprint.la:
- cd $(top_builddir)/src/main; \
- $(MAKE)
-
-$(top_builddir)/src/gutenprintui/libgutenprintui.la:
- cd $(top_builddir)/src/gutenprintui; \
- $(MAKE)
-
-$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
- cd $(top_builddir)/src/gutenprintui2; \
- $(MAKE)
-
-dist-hook: $(USER_GUIDE)
- for file in $(DISTHOOKFILES) ; do \
- if test -f $$file ; then \
- if ! test -d $(distdir)/`dirname $$file` ; then \
- mkdir $(distdir)/`dirname $$file` ; \
- fi ; \
- cp -p $$file $(distdir)/`dirname $$file` ; \
- fi ; \
- done
- for dir in $(DISTHOOKDIRS) ; do \
- if test -d $(srcdir)/$$dir ; then \
- mkdir $(distdir)/$$dir; \
- for dirfile in $(srcdir)/$$dir/*; do \
- if test -f $$dirfile ; then \
- cp -p $$dirfile $(distdir)/$$dir ; \
- fi ; \
- if test -d $$dirfile ; then \
- cp -pR $$dirfile $(distdir)/$$dir ; \
- fi ; \
- done \
- fi \
- done
-
-$(UTIL_MANUAL).pdf: $(UTIL_MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- fi ; \
- $(DB2PDF) $(UTIL_MANUAL).sgml
-
-$(GIMP_MANUAL).pdf: $(GIMP_MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
- cp -p $$image figures/`basename $$image` ; \
- done ; \
- fi ; \
- $(DB2PDF) $(GIMP_MANUAL).sgml
-
-$(CUPS_MANUAL).pdf: $(CUPS_MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
- cp -p $$image figures/`basename $$image` ; \
- done ; \
- fi ; \
- $(DB2PDF) $(CUPS_MANUAL).sgml
-
-$(MANUAL).pdf: $(MANUAL_SRC_FILES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
- if test -d figures ; then \
- : ; \
- else \
- mkdir figures ; \
- fi ; \
- for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
- cp -p $$image figures/`basename $$image` ; \
- done ; \
- fi ; \
- $(DB2PDF) $(MANUAL).sgml
-
-editions: docs cups_docs gimp_docs util_docs
-
-util_docs: util_html util_pdf
-gimp_docs: gimp_html gimp_pdf
-cups_docs: cups_html cups_pdf
-docs: html pdf
-
-all_util_docs: util_html util_ps util_pdf
-all_gimp_docs: gimp_html gimp_ps gimp_pdf
-all_cups_docs: cups_html cups_ps cups_pdf
-all_docs: html ps pdf
-
-all-local: $(ALL_LOCAL_TARGETS)
-
-util_pdf: $(UTIL_MANUAL).pdf
-gimp_pdf: $(GIMP_MANUAL).pdf
-cups_pdf: $(CUPS_MANUAL).pdf
-pdf: $(MANUAL).pdf
-
-util_ps: $(UTIL_MANUAL).ps
-gimp_ps: $(GIMP_MANUAL).ps
-cups_ps: $(CUPS_MANUAL).ps
-ps: $(MANUAL).ps
-
-$(UTIL_MANUAL).ps: $(UTIL_MANUAL_SRC_FILES) $(UTIL_EPS_IMAGES)
- for i in $(UTIL_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(UTIL_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(UTIL_MANUAL)-eps.sgml
- $(DB2PS) $(UTIL_MANUAL)-eps.sgml
- mv $(UTIL_MANUAL)-eps.ps $(UTIL_MANUAL).ps
- for i in $(UTIL_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-$(GIMP_MANUAL).ps: $(GIMP_MANUAL_SRC_FILES) $(GIMP_EPS_IMAGES)
- for i in $(GIMP_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(GIMP_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(GIMP_MANUAL)-eps.sgml
- $(DB2PS) $(GIMP_MANUAL)-eps.sgml
- mv $(GIMP_MANUAL)-eps.ps $(GIMP_MANUAL).ps
- for i in $(GIMP_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-$(CUPS_MANUAL).ps: $(CUPS_MANUAL_SRC_FILES) $(CUPS_EPS_IMAGES)
- for i in $(CUPS_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(CUPS_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(CUPS_MANUAL)-eps.sgml
- $(DB2PS) $(CUPS_MANUAL)-eps.sgml
- mv $(CUPS_MANUAL)-eps.ps $(CUPS_MANUAL).ps
- for i in $(CUPS_MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-$(MANUAL).ps: $(MANUAL_SRC_FILES) $(EPS_IMAGES)
- for i in $(MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- sed -e 's/\.png"/.eps"/g' \
- -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
- done
- cat $(MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(MANUAL)-eps.sgml
- $(DB2PS) $(MANUAL)-eps.sgml
- mv $(MANUAL)-eps.ps $(MANUAL).ps
- for i in $(MANUAL_SRC_FILES); do \
- j=`basename $$i .sgml`; \
- $(RM) -f $${j}-eps.*; \
- done
-
-%.eps:
- if test ! -d figures ; then mkdir figures ; fi
- $(CONVERT) $(srcdir)/$(basename $@).png EPS$(EPSLEVEL):$@
-
-util_html: util-html-stamp
-gimp_html: gimp-html-stamp
-cups_html: cups-html-stamp
-html: html-stamp
-
-# This ugly workaround with SOURCE is because db2html doesn't seem to like
-# "./users-guide.sgml". Note that db2ps does not have the same limitation.
-# html-stamp should *only* be called by html--it's just a timestamp!
-
-util-html-stamp: $(UTIL_MANUAL_SRC_FILES) $(UTIL_PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(UTIL_MANUAL).sgml
- -$(RM) -rf $(UTIL_HTMLDIR)
- mv $(UTIL_MANUAL) $(UTIL_HTMLDIR)
- chmod a+rx $(UTIL_HTMLDIR)
- touch util-html-stamp
-
-gimp-html-stamp: $(GIMP_MANUAL_SRC_FILES) $(GIMP_PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(GIMP_MANUAL).sgml
- -mkdir $(GIMP_MANUAL)/figures
- for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
- cp -p $$image $(GIMP_MANUAL)/figures/`basename $$image` ; \
- done
- -$(RM) -rf $(GIMP_HTMLDIR)
- mv $(GIMP_MANUAL) $(GIMP_HTMLDIR)
- chmod a+rx $(GIMP_HTMLDIR)
- touch gimp-html-stamp
-
-cups-html-stamp: $(CUPS_MANUAL_SRC_FILES) $(CUPS_PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(CUPS_MANUAL).sgml
- -mkdir $(CUPS_MANUAL)/figures
- for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
- cp -p $$image $(CUPS_MANUAL)/figures/`basename $$image` ; \
- done
- -$(RM) -rf $(CUPS_HTMLDIR)
- mv $(CUPS_MANUAL) $(CUPS_HTMLDIR)
- chmod a+rx $(CUPS_HTMLDIR)
- touch cups-html-stamp
-
-html-stamp: $(MANUAL_SRC_FILES) $(PNG_IMAGES)
- if test $(srcdir) = '.' ; then \
- : ; \
- else \
- if test -L $(notdir $<) ; then \
- $(RM) $(notdir $<) ; \
- fi ; \
- $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
- fi
- $(DB2HTML) $(MANUAL).sgml
- -mkdir $(MANUAL)/figures
- for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
- cp -p $$image $(MANUAL)/figures/`basename $$image` ; \
- done
- -$(RM) -rf $(HTMLDIR)
- mv $(MANUAL) $(HTMLDIR)
- chmod a+rx $(HTMLDIR)
- touch html-stamp
-
-install-data-local: $(STANDARD_TARGETS)
- if test -n '$(STANDARD_TARGETS)' ; then \
- $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
- $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
- if test -f $(MANUAL).pdf ; then \
- $(INSTALL_DATA) $(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
- elif test -f $(srcdir)/$(MANUAL).pdf ; then \
- $(INSTALL_DATA) $(srcdir)/$(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
- fi ; \
- if test -d $(HTMLDIR) ; then \
- HTMLGENDIR="$(HTMLDIR)" ; \
- elif test -d $(srcdir)/$(HTMLDIR) ; then \
- HTMLGENDIR="$(srcdir)/$(HTMLDIR)" ; \
- else \
- exit 1 ; \
- fi ; \
- for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
- if test -f $$file ; then \
- $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html ; \
- fi ; \
- done ; \
- for file in $(srcdir)/figures/*.png ; do \
- if test -f $$file ; then \
- $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
- fi ; \
- done ; \
- if test -d $$HTMLGENDIR/stylesheet-images ; then \
- for file in $$HTMLGENDIR/stylesheet-images/* ; do \
- if test -f $$file ; then \
- $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
- fi ; \
- done ; \
- fi ; \
- fi
-
-uninstall-local:
- -$(RM) -r $(DESTDIR)$(datadir)/$(PACKAGE)/doc
-
-clean-local:
- if test $(srcdir) = "." -a $(MAINT_MODE) = false ; then \
- echo "clean-local: Not removing $(HTMLDIR)" ; \
- echo 'clean-local: Not removing $(MANUAL).pdf' ; \
- echo 'clean-local: Not removing $(MANUAL).ps' ; \
- echo 'clean-local: Not removing EPS figures' ; \
- else \
- $(CLEAN_MANUALS) ; \
- fi
- if test $(srcdir) = "." ; then \
- : ; \
- else \
- $(RM) -f $(MANUAL_SRC_FILES) $(CUPS_MANUAL_SRC_FILES) ; \
- $(RM) -f $(GIMP_MANUAL_SRC_FILES) $(UTIL_CUPS_MANUAL_SRC_FILES) ; \
- $(RM) -rf figures ; \
- fi
- -$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
- -$(RM) -rf db2html* DB2HTML*
-
-veryclean:
- $(MAKE) MAINT_MODE=true clean
-
-maintainer-clean-local:
- $(CLEAN_MANUALS)
-
-#
-# This is my (so far failed) attempt to create an index for this documentation.
-#
-#
-#index.sgml:
-# $(PERL) /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -N -o index.sgml
-#
-# $(JADE) -V html-index \
-# -t sgml \
-# -c /usr/share/sgml/CATALOG.jade_dsl \
-# -c /usr/share/sgml/CATALOG.docbook-dsssl-stylesheets \
-# -c /usr/share/sgml/CATALOG.gnome \
-# -c /usr/share/sgml/CATALOG.docbook_4 \
-# -c /usr/share/sgml/CATALOG.docbook_3 \
-# -D /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64 \
-# -d /usr/share/sgml/docbook-toys/suse-both.dsl \
-# -o index.sgml \
-# gimp-print-users-guide-4.1.99-b3.sgml
-#
-#
-# END failed attempt at index creation.
-#
-
-help:
- @echo " "
- @echo "Targets for the complete user's guide:"
- @echo " "
- @echo " docs - creates PS, PDF, and HTML documentation files"
- @echo " all_docs - creates PS and HTML documentation files"
- @echo " ps - creates PostScript documentation"
- @echo " pdf - creates PDF documentation"
- @echo " html - creates HTML documentation"
- @echo " clean - deletes machine generated files, but not outputs"
- @echo " veryclean - deletes output files in addition"
- @echo " help - prints this help text"
- @echo ""
- @echo "Targets for specific manual editions:"
- @echo " "
- @echo " cups_html - generate HTML for CUPS edition of the manual"
- @echo " cups_pdf - generate PDF for CUPS edition of the manual"
- @echo " cups_ps - generate PS for CUPS edition of the manual"
- @echo " "
- @echo " gimp_docs - generate HTML, PDF, and PS for GIMP edition of the manual"
- @echo " gimp_html - generate HTML for GIMP edition of the manual"
- @echo " gimp_pdf - generate PDF for GIMP edition of the manual"
- @echo " gimp_ps - generate PS for GIMP edition of the manual"
- @echo " "
- @echo " util_docs - generate HTML, PDF, and PS for UTIL edition of the manual"
- @echo " util_html - generate HTML for UTIL edition of the manual"
- @echo " util_pdf - generate PDF for UTIL edition of the manual"
- @echo " util_ps - generate PS for UTIL edition of the manual"
- @echo " "
- @echo " editions - generates HTML, PDF, and PS for ALL editions of the manual"
- @echo " "
-
-.PHONY: docs cups_docs gimp_docs util_docs
-.PHONY: all_docs all_cups_docs all_gimp_docs all_util_docs
-.PHONY: html cups_html gimp_html util_html
-.PHONY: ps cups_ps gimp_ps util_ps
-.PHONY: pdf cups_pdf gimp_pdf util_pdf
-.PHONY: help
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/doc/users_guide/README b/doc/users_guide/README
deleted file mode 100644
index c6f1025..0000000
--- a/doc/users_guide/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-The files contained in this directory are all of the source files necessary
-to build "The User's Guide to the Gutenprint Top Quality Printer Drivers".
-
-Type: make pdf - to build the PDF documentation file
- make ps - to build the Postscript documentation file
- make html - to build the HTML documentation files
- make docs - to build all of the documentation files
-
-This is what will be generated:
-
- users_guide.ps
- users_guide.pdf
- html/book1.html
-
-While building the documentation, you will see messages from LaTeX regarding
-undefined references. These can also be safely ignored.
-
-The documentation contains many color screenshots. My goal was to have the
-documentation print acceptably at 360 DPI. However, I realize that not everybody
-has a color printer. For those people, such as the owners of laser printers,
-I'd like to suggest printing the documentation in greyscale. Printing the
-documentation in black and white will results in unacceptable quality for many
-of the screenshots.
-
-All of the figures are contained in the "figures" subdirectory. Read the
-figures/README file if you are interested in how I created the
-screenshots used throughout the documentation.
-
-All of the HTML files are contained in the "html" subdirectory.
-
-Your constructive feedback is most welcome.
-
-Andy Stewart
-13-oct-2001
-
-
-
-
diff --git a/doc/users_guide/cups-edition.sgml b/doc/users_guide/cups-edition.sgml
deleted file mode 100644
index 2056bbf..0000000
--- a/doc/users_guide/cups-edition.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp SYSTEM "gimp.sgml">
-<!ENTITY cups SYSTEM "cups.sgml">
-<!ENTITY utils SYSTEM "utils.sgml">
-<!ENTITY gfdl SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
- <title>The User's Guide to the Gutenprint - CUPS Edition</title>
- <date>April 7, 2002</date>
- <pubdate>April 7, 2002</pubdate>
- <author>
- <firstname>Andy</firstname>
- <surname>Stewart</surname>
- </author>
- <copyright>
- <year>2002</year>
- <holder>Andy Stewart</holder>
- </copyright>
- <legalnotice>
- <para>The User's Guide to the Gutenprint - CUPS Edition, Copyright
-2002, Andy Stewart.
- </para>
-
-&title;
-
-<chapter><title>CUPS Edition</title>
-
- <caution><title>PLEASE NOTE</title>
-
- <para>
- This manual includes a subset of chapters from a more complete
-manual entitled <emphasis>The User's Guide to the Gutenprint Top
-Quality Printer Drivers</emphasis>. To obtain the complete manual, go
-to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
-Project</ulink> home page.
- </para>
- <para>
- This version of the manual has been specifically packaged in this
-way in an attempt to better suit the needs of people interested only
-in using the Gutenprint software with
-<ulink url="http://www.cups.org">CUPS</ulink> (Common Unix Printing System).
- </para>
-
- </caution>
-
-</chapter>
-
-&history;
-&cups;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/cups.sgml b/doc/users_guide/cups.sgml
deleted file mode 100644
index c39506f..0000000
--- a/doc/users_guide/cups.sgml
+++ /dev/null
@@ -1,320 +0,0 @@
-
- <chapter><title>CUPS and Gutenprint</title>
- <sect1><title>Introduction</title>
- <para>
- CUPS is an acronym which stands for <emphasis>C</emphasis>ommon
-<emphasis>U</emphasis>nix <emphasis>P</emphasis>rinting
-<emphasis>S</emphasis>ystem. It is assumed that the reader has
-properly installed the CUPS software and the Gutenprint software.
-This section will discuss adding a printer to CUPS that uses a
-Gutenprint printer driver, as well as how to modify the various
-settings supplied by Gutenprint. This will be a rather quick
-explanation, as the CUPS software is quite well documented, and it is
-not my intention to attempt to duplicate the CUPS documentation here.
- </para>
- </sect1>
-
- <sect1><title>CUPS Printer Installation</title>
- <para>
-This explanation will use the web interface provided by CUPS. First,
-aim your favorite web browser at
-<ulink url="http://localhost:631">the CUPS server</ulink>. The
-following screen should appear within your browser.
- </para>
-
- <figure><title>The CUPS Startup Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="45" fileref="figures/cups_startup.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Startup Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
-Now, you may click on either the word <guilabel>Printers</guilabel> in the bar at the top
-of the page, or you may click on the <guilabel>Manage Printers</guilabel> text. In
-either case, the next screen you see will look like this one if you
-have not yet configured any printers.
- </para>
-
- <figure><title>The CUPS Printers Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="45" fileref="figures/cups_printers.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Printers Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
-At this time, click on the <guibutton>Add Printer</guibutton> button.
-You will then see the Admin screen (shown below).
- </para>
-
- <figure><title>The CUPS Admin Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="45" fileref="figures/cups_admin.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Admin Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
-Notice in the screenshot that the three boxes are shown after the
-author filled them in for his printer at home. You will need to fill
-in an appropriate name of your printer, its location, and a
-description which meets your own needs. Once this is done, click on
-the <guibutton>Continue</guibutton> button, and then this screen will appear.
- </para>
-
- <figure id="fig-cups-admin-device"><title>The CUPS Admin Device Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="35" fileref="figures/cups_admin_device.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Admin Device Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
-Click on the drop down menu next to the word
-<guilabel>Device</guilabel> and a list of possible printer devices
-appears. Select the device appropriate for your printer. Note that
-there are a range of serial, parallel, USB, and other devices from
-which to choose. Once the selection is made, click the
-<guibutton>Continue</guibutton> button. Now, this screen appears.
- </para>
-
- <figure><title>The CUPS Admin Model/Driver Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="35" fileref="figures/cups_admin_make.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Admin Model/Driver Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <caution>
- <title>Caution Regarding USB Printers</title>
-
- <para>
-CUPS versions 1.1.11 and later <emphasis>REQUIRE</emphasis>
-the user to insure that the desired USB printer is powered on
-<emphasis>AND</emphasis> physically connected to the USB bus
-<emphasis>BEFORE</emphasis> starting the CUPS software.
- </para>
- <para>
-CUPS must see the USB printer when the software starts. The CUPS software
-is typically started when the computer boots. Note that one cannot
-simply plug in the USB printer and power it on after CUPS has started.
-(Note that this does not apply to parallel port printers).
- </para>
- <para>
-If the USB printer was not connected and powered on at the time CUPS was
-started, there will not be a USB printer shown in the
-list of devices on the CUPS Admin Device Window (see
-<xref linkend="fig-cups-admin-device">). In this event, stop the CUPS
-software, properly connect and power on the USB printer, and restart
-the CUPS software.
- </para>
- <para>
-From the list of devices shown in the CUPS Admin Device Window
-(see <xref linkend="fig-cups-admin-device">), a clever user might
-attempt to avoid this issue by selecting
-<guimenuitem>Internet Printing Protocol</guimenuitem>
-and then enter something similar to 'usb:/dev/usblp0' in the next
-screen. However, this fails later in the configuration process with a
-"client_error_not_possible" error message with no other explanation.
-Note that entering 'file:/dev/usblp0' will not work either. While CUPS
-will allow this, printing will not actually work in some situations.
- </para>
- <para>
-CUPS versions 1.1.10 and earlier exhibit similar behavior with regard
-to not displaying the USB printer if it was not connected to the USB
-bus and powered up prior to starting the CUPS software. However,
-these versions of CUPS will indeed allow the user to enter the name of
-the USB connection, unlike versions 1.1.11 and later.
- </para>
- </caution>
-
- <para>
-Select the manufacturer of your printer and click the
-<guibutton>Continue</guibutton> button. A window will appear which
-asks you to select the specific model number for your printer.
- </para>
-
- <para>
-Scroll through the long list and find the model number for your
-printer. Notice carefully that there are many different languages
-supported for each printer, as denoted by the initials in parenthesis.
-(en) would be for English, (da) for Danish, (sv) for Swedish, (fr) for
-French, (no) for Norwegian, (pl) for Polish, and (en_GB) for British
-English (see <xref linkend="fig-cups-admin-model">). Also take note
-of the Gutenprint revision for the driver, and ensure that it is
-indeed the version of Gutenprint which you have most recently
-installed. Once you have made the proper selection, click on the
-<guibutton>Continue</guibutton> button.
- </para>
-
- <figure id="fig-cups-admin-model"><title>The 2nd CUPS Admin Model/Driver Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="55" fileref="figures/cups_admin_model.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The 2nd CUPS Admin Model/Driver Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <figure><title>The CUPS Admin Success Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="39" fileref="figures/cups_admin_success.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Admin Success Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
-Congratulations! You should now see the CUPS window indicating that
-your printer was successfully installed. Notice the sentence which
-reads "Printer your_printer has been added successfully". Click on
-your_printer, which will be the underlined name for your printer.
- </para>
-
- <figure id="fig-cups-my-printer"><title>The CUPS Window for Your Printer</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="65" fileref="figures/cups_my_printer.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Window for Your Printer</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
-After clicking on your_printer (epson_870 in this example), a window
-will appear similar to that shown in <xref linkend="fig-cups-my-printer">.
-It would probably be a good idea at this point to click on the
-<guibutton>Print Test Page</guibutton> button to ensure that
-everything is working properly. Take note of the Gutenprint revision
-printed on this screen and confirm once again that it is the expected
-revision.
- </para>
-
- </sect1>
-
- <sect1><title>Configuring your Printer in CUPS</title>
-
- <para>
-With reference to <xref linkend="fig-cups-my-printer">, click
-on the <guibutton>Configure Printer</guibutton> button. A partial
-screenshot of the printer configuration window appears in
-<xref linkend="fig-cups-printer-config-window">.
-The contents of this window will vary depending on precisely which
-printer you selected when you configured CUPS for your printer. The
-screenshot shows the selections made by the author for his printer.
-The individual selections will not be explained in detail here, as
-they are the same selections which are available when using the
-Gutenprint plugin to the GIMP. These selections are explained in
-detail in various sections of the <emphasis>GIMP and
-Gutenprint</emphasis> chapter of <emphasis>The User's Guide to the
-Gutenprint Top Quality Printer Drivers</emphasis>.
- </para>
-
- <figure id="fig-cups-printer-config-window"><title>The CUPS Printer Cofiguration Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="30" fileref="figures/cups_config_printer.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The CUPS Printer Configuration Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
-
- </sect1>
-
- <sect1><title>Using CUPS from the Command Line</title>
-
- <para>
- It is possible to use the CUPS printing system from the command
-line. While this document will not delve into all of the specifics of
-the CUPS command line interface, there are portions of this interface
-which are specific to the Gutenprint software.
- </para>
-
- <para>
-The command line is in some cases a more convenient way to generate
-printed output (e.g. when printing from a script). However, most
-people (including the author) cannot easily predict what a command
-line option of "-o stpCyan=1350" will do to the output. It is
-therefore a good idea to use the GIMP to view the image and the
-Gutenprint plugin to preview these settings before relying on the
-command line.
- </para>
-
- <para>
-When using CUPS from the command line, the command will have this
-general format:
-
- <programlisting>
- <![ CDATA [
- lpr -P my_printer_name \
- -o option1=<choice1> \
- -o option2=<choice2> \
- /path/to/printfile
- ]]>
- </programlisting>
-
-When typing the command directly onto the command line, put all of the
-command line options on one line, and do not type the "\" characters.
-The list of possible options which are specific to Gutenprint,
-followed by some of the supported choices, are shown below:
-
- <programlisting>
- <![ CDATA [
- -o PageSize=<...| A3 | A4 | A4 | ...>
- -o InputSlot=<Roll | Standard>
- -o MediaType=< ..| Inkjet | Plain | GlossyPaper | ...>
- -o Resolution=<360sw | 360swuni ...| 1440x720 >
- -o ColorModel=<Black | RGB | Gray | CMYK>
- -o stpBrightness=<0...2000>
- -o stpContrast=<0...2000>
- -o stpCyan=<0...4000>
- -o stpDensity=<0...2000>
- -o stpDither=<0...4000>
- -o stpGamma=<0...4000>
- -o stpImageType=<LineArt | Continuous | SolidTone>
- -o stpInkType=<PhotoCMY | CMYK | PhotoCMYK | RGB>
- -o stpMagenta=<0...4000>
- -o stpSaturation=<0...9000>
- -o stpYellow=<0...4000>
- ]]>
- </programlisting>
-
-For more detailed information, consult the appropriate sections of the <emphasis>GIMP and
-Gutenprint</emphasis> chapter of <emphasis>The User's Guide to the
-Gutenprint Top Quality Printer Drivers</emphasis>.
- </para>
-
- </sect1>
-
- </chapter>
diff --git a/doc/users_guide/figures/cups_admin.png b/doc/users_guide/figures/cups_admin.png
deleted file mode 100644
index 464fcc4..0000000
--- a/doc/users_guide/figures/cups_admin.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_admin_device.png b/doc/users_guide/figures/cups_admin_device.png
deleted file mode 100644
index b258263..0000000
--- a/doc/users_guide/figures/cups_admin_device.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_admin_make.png b/doc/users_guide/figures/cups_admin_make.png
deleted file mode 100644
index 1948ba7..0000000
--- a/doc/users_guide/figures/cups_admin_make.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_admin_model.png b/doc/users_guide/figures/cups_admin_model.png
deleted file mode 100644
index b476a75..0000000
--- a/doc/users_guide/figures/cups_admin_model.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_admin_success.png b/doc/users_guide/figures/cups_admin_success.png
deleted file mode 100644
index edebafe..0000000
--- a/doc/users_guide/figures/cups_admin_success.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_config_printer.png b/doc/users_guide/figures/cups_config_printer.png
deleted file mode 100644
index 1f980dc..0000000
--- a/doc/users_guide/figures/cups_config_printer.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_my_printer.png b/doc/users_guide/figures/cups_my_printer.png
deleted file mode 100644
index d8441c8..0000000
--- a/doc/users_guide/figures/cups_my_printer.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_printers.png b/doc/users_guide/figures/cups_printers.png
deleted file mode 100644
index 4d45d1c..0000000
--- a/doc/users_guide/figures/cups_printers.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/cups_startup.png b/doc/users_guide/figures/cups_startup.png
deleted file mode 100644
index 22d01d0..0000000
--- a/doc/users_guide/figures/cups_startup.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp-print-gui-1.png b/doc/users_guide/figures/gimp-print-gui-1.png
deleted file mode 100644
index 1c083bb..0000000
--- a/doc/users_guide/figures/gimp-print-gui-1.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp-print-gui.png b/doc/users_guide/figures/gimp-print-gui.png
deleted file mode 100644
index a9739fb..0000000
--- a/doc/users_guide/figures/gimp-print-gui.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp-print-new-printer.png b/doc/users_guide/figures/gimp-print-new-printer.png
deleted file mode 100644
index 39dd681..0000000
--- a/doc/users_guide/figures/gimp-print-new-printer.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp-print-print-color-adjust.png b/doc/users_guide/figures/gimp-print-print-color-adjust.png
deleted file mode 100644
index 5ab1a33..0000000
--- a/doc/users_guide/figures/gimp-print-print-color-adjust.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp-print-setup.png b/doc/users_guide/figures/gimp-print-setup.png
deleted file mode 100644
index e406c0b..0000000
--- a/doc/users_guide/figures/gimp-print-setup.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp_image.png b/doc/users_guide/figures/gimp_image.png
deleted file mode 100644
index 9193558..0000000
--- a/doc/users_guide/figures/gimp_image.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/figures/gimp_startup.png b/doc/users_guide/figures/gimp_startup.png
deleted file mode 100644
index b6335e1..0000000
--- a/doc/users_guide/figures/gimp_startup.png
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/gfdl.sgml b/doc/users_guide/gfdl.sgml
deleted file mode 100644
index 6db9fbe..0000000
--- a/doc/users_guide/gfdl.sgml
+++ /dev/null
@@ -1,466 +0,0 @@
-<appendix id="gfdl">
-<title>GNU Free Documentation License</title>
-<!-- - GNU Project - Free Software Foundation (FSF) -->
-<!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->
-
-
- <!-- sect1>
- <title>GNU Free Documentation License</title -->
-
- <para>Version 1.1, March 2000</para>
-
- <blockquote>
- <para>Copyright (C) 2000 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.</para>
- </blockquote>
-
- <sect1 label="0">
- <title>PREAMBLE</title>
-
- <para>The purpose of this License is to make a manual, textbook,
- or other written document "free" in the sense of freedom: to
- assure everyone the effective freedom to copy and redistribute it,
- with or without modifying it, either commercially or
- noncommercially. Secondarily, this License preserves for the
- author and publisher a way to get credit for their work, while not
- being considered responsible for modifications made by
- others.</para>
-
- <para>This License is a kind of "copyleft", which means that
- derivative works of the document must themselves be free in the
- same sense. It complements the GNU General Public License, which
- is a copyleft license designed for free software.</para>
-
- <para>We have designed this License in order to use it for manuals
- for free software, because free software needs free documentation:
- a free program should come with manuals providing the same
- freedoms that the software does. But this License is not limited
- to software manuals; it can be used for any textual work,
- regardless of subject matter or whether it is published as a
- printed book. We recommend this License principally for works
- whose purpose is instruction or reference.</para>
- </sect1>
-
- <sect1 label="1">
- <title>APPLICABILITY AND DEFINITIONS</title>
-
- <para>This License applies to any manual or other work that
- contains a notice placed by the copyright holder saying it can be
- distributed under the terms of this License. The "Document",
- below, refers to any such manual or work. Any member of the
- public is a licensee, and is addressed as "you".</para>
-
- <para>A "Modified Version" of the Document means any work
- containing the Document or a portion of it, either copied
- verbatim, or with modifications and/or translated into another
- language.</para>
-
- <para>A "Secondary Section" is a named appendix or a front-matter
- section of the Document that deals exclusively with the
- relationship of the publishers or authors of the Document to the
- Document's overall subject (or to related matters) and contains
- nothing that could fall directly within that overall subject.
- (For example, if the Document is in part a textbook of
- mathematics, a Secondary Section may not explain any mathematics.)
- The relationship could be a matter of historical connection with
- the subject or with related matters, or of legal, commercial,
- philosophical, ethical or political position regarding
- them.</para>
-
- <para>The "Invariant Sections" are certain Secondary Sections
- whose titles are designated, as being those of Invariant Sections,
- in the notice that says that the Document is released under this
- License.</para>
-
- <para>The "Cover Texts" are certain short passages of text that
- are listed, as Front-Cover Texts or Back-Cover Texts, in the
- notice that says that the Document is released under this
- License.</para>
-
- <para>A "Transparent" copy of the Document means a
- machine-readable copy, represented in a format whose specification
- is available to the general public, whose contents can be viewed
- and edited directly and straightforwardly with generic text
- editors or (for images composed of pixels) generic paint programs
- or (for drawings) some widely available drawing editor, and that
- is suitable for input to text formatters or for automatic
- translation to a variety of formats suitable for input to text
- formatters. A copy made in an otherwise Transparent file format
- whose markup has been designed to thwart or discourage subsequent
- modification by readers is not Transparent. A copy that is not
- "Transparent" is called "Opaque".</para>
-
- <para>Examples of suitable formats for Transparent copies include
- plain ASCII without markup, Texinfo input format, LaTeX input
- format, SGML or XML using a publicly available DTD, and
- standard-conforming simple HTML designed for human modification.
- Opaque formats include PostScript, PDF, proprietary formats that
- can be read and edited only by proprietary word processors, SGML
- or XML for which the DTD and/or processing tools are not generally
- available, and the machine-generated HTML produced by some word
- processors for output purposes only.</para>
-
- <para>The "Title Page" means, for a printed book, the title page
- itself, plus such following pages as are needed to hold, legibly,
- the material this License requires to appear in the title page.
- For works in formats which do not have any title page as such,
- "Title Page" means the text near the most prominent appearance of
- the work's title, preceding the beginning of the body of the
- text.</para>
- </sect1>
-
- <sect1 label="2">
- <title>VERBATIM COPYING</title>
-
- <para>You may copy and distribute the Document in any medium,
- either commercially or noncommercially, provided that this
- License, the copyright notices, and the license notice saying this
- License applies to the Document are reproduced in all copies, and
- that you add no other conditions whatsoever to those of this
- License. You may not use technical measures to obstruct or
- control the reading or further copying of the copies you make or
- distribute. However, you may accept compensation in exchange for
- copies. If you distribute a large enough number of copies you
- must also follow the conditions in section 3.</para>
-
- <para>You may also lend copies, under the same conditions stated
- above, and you may publicly display copies.</para>
- </sect1>
-
- <sect1 label="3">
- <title>COPYING IN QUANTITY</title>
-
- <para>If you publish printed copies of the Document numbering more
- than 100, and the Document's license notice requires Cover Texts,
- you must enclose the copies in covers that carry, clearly and
- legibly, all these Cover Texts: Front-Cover Texts on the front
- cover, and Back-Cover Texts on the back cover. Both covers must
- also clearly and legibly identify you as the publisher of these
- copies. The front cover must present the full title with all
- words of the title equally prominent and visible. You may add
- other material on the covers in addition. Copying with changes
- limited to the covers, as long as they preserve the title of the
- Document and satisfy these conditions, can be treated as verbatim
- copying in other respects.</para>
-
- <para>If the required texts for either cover are too voluminous to
- fit legibly, you should put the first ones listed (as many as fit
- reasonably) on the actual cover, and continue the rest onto
- adjacent pages.</para>
-
- <para>If you publish or distribute Opaque copies of the Document
- numbering more than 100, you must either include a
- machine-readable Transparent copy along with each Opaque copy, or
- state in or with each Opaque copy a publicly-accessible
- computer-network location containing a complete Transparent copy
- of the Document, free of added material, which the general
- network-using public has access to download anonymously at no
- charge using public-standard network protocols. If you use the
- latter option, you must take reasonably prudent steps, when you
- begin distribution of Opaque copies in quantity, to ensure that
- this Transparent copy will remain thus accessible at the stated
- location until at least one year after the last time you
- distribute an Opaque copy (directly or through your agents or
- retailers) of that edition to the public.</para>
-
- <para>It is requested, but not required, that you contact the
- authors of the Document well before redistributing any large
- number of copies, to give them a chance to provide you with an
- updated version of the Document.</para>
- </sect1>
-
- <sect1 label="4">
- <title>MODIFICATIONS</title>
-
- <para>You may copy and distribute a Modified Version of the
- Document under the conditions of sections 2 and 3 above, provided
- that you release the Modified Version under precisely this
- License, with the Modified Version filling the role of the
- Document, thus licensing distribution and modification of the
- Modified Version to whoever possesses a copy of it. In addition,
- you must do these things in the Modified Version:</para>
-
- <orderedlist numeration="upperalpha">
- <listitem><para>Use in the Title Page
- (and on the covers, if any) a title distinct from that of the
- Document, and from those of previous versions (which should, if
- there were any, be listed in the History section of the
- Document). You may use the same title as a previous version if
- the original publisher of that version gives permission.</para>
- </listitem>
-
- <listitem><para>List on the Title Page,
- as authors, one or more persons or entities responsible for
- authorship of the modifications in the Modified Version,
- together with at least five of the principal authors of the
- Document (all of its principal authors, if it has less than
- five).</para>
- </listitem>
-
- <listitem><para>State on the Title page
- the name of the publisher of the Modified Version, as the
- publisher.</para>
- </listitem>
-
- <listitem><para>Preserve all the
- copyright notices of the Document.</para>
- </listitem>
-
- <listitem><para>Add an appropriate
- copyright notice for your modifications adjacent to the other
- copyright notices.</para>
- </listitem>
-
- <listitem><para>Include, immediately
- after the copyright notices, a license notice giving the public
- permission to use the Modified Version under the terms of this
- License, in the form shown in the Addendum below.</para>
- </listitem>
-
- <listitem><para>Preserve in that license
- notice the full lists of Invariant Sections and required Cover
- Texts given in the Document's license notice.</para>
- </listitem>
-
- <listitem><para>Include an unaltered
- copy of this License.</para>
- </listitem>
-
- <listitem><para>Preserve the section
- entitled "History", and its title, and add to it an item stating
- at least the title, year, new authors, and publisher of the
- Modified Version as given on the Title Page. If there is no
- section entitled "History" in the Document, create one stating
- the title, year, authors, and publisher of the Document as given
- on its Title Page, then add an item describing the Modified
- Version as stated in the previous sentence.</para>
- </listitem>
-
- <listitem><para>Preserve the network
- location, if any, given in the Document for public access to a
- Transparent copy of the Document, and likewise the network
- locations given in the Document for previous versions it was
- based on. These may be placed in the "History" section. You
- may omit a network location for a work that was published at
- least four years before the Document itself, or if the original
- publisher of the version it refers to gives permission.</para>
- </listitem>
-
- <listitem><para>In any section entitled
- "Acknowledgements" or "Dedications", preserve the section's
- title, and preserve in the section all the substance and tone of
- each of the contributor acknowledgements and/or dedications
- given therein.</para>
- </listitem>
-
- <listitem><para>Preserve all the
- Invariant Sections of the Document, unaltered in their text and
- in their titles. Section numbers or the equivalent are not
- considered part of the section titles.</para>
- </listitem>
-
- <listitem><para>Delete any section
- entitled "Endorsements". Such a section may not be included in
- the Modified Version.</para>
- </listitem>
-
- <listitem><para>Do not retitle any
- existing section as "Endorsements" or to conflict in title with
- any Invariant Section.</para>
- </listitem>
- </orderedlist>
-
- <para>If the Modified Version includes new front-matter sections
- or appendices that qualify as Secondary Sections and contain no
- material copied from the Document, you may at your option
- designate some or all of these sections as invariant. To do this,
- add their titles to the list of Invariant Sections in the Modified
- Version's license notice. These titles must be distinct from any
- other section titles.</para>
-
- <para>You may add a section entitled "Endorsements", provided it
- contains nothing but endorsements of your Modified Version by
- various parties--for example, statements of peer review or that
- the text has been approved by an organization as the authoritative
- definition of a standard.</para>
-
- <para>You may add a passage of up to five words as a Front-Cover
- Text, and a passage of up to 25 words as a Back-Cover Text, to the
- end of the list of Cover Texts in the Modified Version. Only one
- passage of Front-Cover Text and one of Back-Cover Text may be
- added by (or through arrangements made by) any one entity. If the
- Document already includes a cover text for the same cover,
- previously added by you or by arrangement made by the same entity
- you are acting on behalf of, you may not add another; but you may
- replace the old one, on explicit permission from the previous
- publisher that added the old one.</para>
-
- <para>The author(s) and publisher(s) of the Document do not by
- this License give permission to use their names for publicity for
- or to assert or imply endorsement of any Modified Version.</para>
- </sect1>
-
- <sect1 label="5">
- <title>COMBINING DOCUMENTS</title>
-
- <para>You may combine the Document with other documents released
- under this License, under the terms defined in section 4 above for
- modified versions, provided that you include in the combination
- all of the Invariant Sections of all of the original documents,
- unmodified, and list them all as Invariant Sections of your
- combined work in its license notice.</para>
-
- <para>The combined work need only contain one copy of this
- License, and multiple identical Invariant Sections may be replaced
- with a single copy. If there are multiple Invariant Sections with
- the same name but different contents, make the title of each such
- section unique by adding at the end of it, in parentheses, the
- name of the original author or publisher of that section if known,
- or else a unique number. Make the same adjustment to the section
- titles in the list of Invariant Sections in the license notice of
- the combined work.</para>
-
- <para>In the combination, you must combine any sections entitled
- "History" in the various original documents, forming one section
- entitled "History"; likewise combine any sections entitled
- "Acknowledgements", and any sections entitled "Dedications". You
- must delete all sections entitled "Endorsements."</para>
- </sect1>
-
- <sect1 label="6">
- <title>COLLECTIONS OF DOCUMENTS</title>
-
- <para>You may make a collection consisting of the Document and
- other documents released under this License, and replace the
- individual copies of this License in the various documents with a
- single copy that is included in the collection, provided that you
- follow the rules of this License for verbatim copying of each of
- the documents in all other respects.</para>
-
- <para>You may extract a single document from such a collection,
- and distribute it individually under this License, provided you
- insert a copy of this License into the extracted document, and
- follow this License in all other respects regarding verbatim
- copying of that document.</para>
- </sect1>
-
- <sect1 label="7">
- <title>AGGREGATION WITH INDEPENDENT WORKS</title>
-
- <para>A compilation of the Document or its derivatives with other
- separate and independent documents or works, in or on a volume of
- a storage or distribution medium, does not as a whole count as a
- Modified Version of the Document, provided no compilation
- copyright is claimed for the compilation. Such a compilation is
- called an "aggregate", and this License does not apply to the
- other self-contained works thus compiled with the Document, on
- account of their being thus compiled, if they are not themselves
- derivative works of the Document.</para>
-
- <para>If the Cover Text requirement of section 3 is applicable to
- these copies of the Document, then if the Document is less than
- one quarter of the entire aggregate, the Document's Cover Texts
- may be placed on covers that surround only the Document within the
- aggregate. Otherwise they must appear on covers around the whole
- aggregate.</para>
- </sect1>
-
- <sect1 label="8">
- <title>TRANSLATION</title>
-
- <para>Translation is considered a kind of modification, so you may
- distribute translations of the Document under the terms of section
- 4. Replacing Invariant Sections with translations requires
- special permission from their copyright holders, but you may
- include translations of some or all Invariant Sections in addition
- to the original versions of these Invariant Sections. You may
- include a translation of this License provided that you also
- include the original English version of this License. In case of
- a disagreement between the translation and the original English
- version of this License, the original English version will
- prevail.</para>
- </sect1>
-
- <sect1 label="9">
- <title>TERMINATION</title>
-
- <para>You may not copy, modify, sublicense, or distribute the
- Document except as expressly provided for under this License. Any
- other attempt to copy, modify, sublicense or distribute the
- Document is void, and will automatically terminate your rights
- under this License. However, parties who have received copies, or
- rights, from you under this License will not have their licenses
- terminated so long as such parties remain in full
- compliance.</para>
- </sect1>
-
- <sect1 label="10">
- <title>FUTURE REVISIONS OF THIS LICENSE</title>
-
- <para>The Free Software Foundation may publish new, revised
- versions of the GNU Free Documentation License from time to time.
- Such new versions will be similar in spirit to the present
- version, but may differ in detail to address new problems or
- concerns. See <ulink
- url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
-
- <para>Each version of the License is given a distinguishing
- version number. If the Document specifies that a particular
- numbered version of this License "or any later version" applies to
- it, you have the option of following the terms and conditions
- either of that specified version or of any later version that has
- been published (not as a draft) by the Free Software Foundation.
- If the Document does not specify a version number of this License,
- you may choose any version ever published (not as a draft) by the
- Free Software Foundation.</para>
- </sect1>
-
- <sect1 label="">
- <title>How to use this License for your documents</title>
-
- <para>To use this License in a document you have written, include
- a copy of the License in the document and put the following
- copyright and license notices just after the title page:</para>
-
-<blockquote><para>
- Copyright (c) YEAR YOUR NAME.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1
- or any later version published by the Free Software Foundation;
- with the Invariant Sections being LIST THEIR TITLES, with the
- Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
-</para></blockquote>
-
- <para>If you have no Invariant Sections, write "with no Invariant
- Sections" instead of saying which ones are invariant. If you have
- no Front-Cover Texts, write "no Front-Cover Texts" instead of
- "Front-Cover Texts being LIST"; likewise for Back-Cover
- Texts.</para>
-
- <para>If your document contains nontrivial examples of program
- code, we recommend releasing these examples in parallel under your
- choice of free software license, such as the GNU General Public
- License, to permit their use in free software.</para>
- </sect1>
-
-</appendix>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-parent-document: ("referenz.sgml" "appendix")
-sgml-exposed-tags:nil
-sgml-local-ecat-files:nil
-sgml-local-catalogs: CATALOG
-sgml-validate-command: "nsgmls -s referenz.sgml"
-ispell-skip-sgml: t
-End:
--->
diff --git a/doc/users_guide/gimp-edition.sgml b/doc/users_guide/gimp-edition.sgml
deleted file mode 100644
index 6834bbd..0000000
--- a/doc/users_guide/gimp-edition.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp SYSTEM "gimp.sgml">
-<!ENTITY cups SYSTEM "cups.sgml">
-<!ENTITY utils SYSTEM "utils.sgml">
-<!ENTITY gfdl SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
- <title>The User's Guide to the Gutenprint - GIMP Edition</title>
- <date>April 7, 2002</date>
- <pubdate>April 7, 2002</pubdate>
- <author>
- <firstname>Andy</firstname>
- <surname>Stewart</surname>
- </author>
- <copyright>
- <year>2002</year>
- <holder>Andy Stewart</holder>
- </copyright>
- <legalnotice>
- <para>The User's Guide to the Gutenprint - GIMP Edition, Copyright
-2002, Andy Stewart.
- </para>
-
-&title;
-
-<chapter><title>GIMP Edition</title>
-
- <caution><title>PLEASE NOTE</title>
-
- <para>
- This manual includes a subset of chapters from a more complete
-manual entitled <emphasis>The User's Guide to the Gutenprint Top
-Quality Printer Drivers</emphasis>. To obtain the complete manual, go
-to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
-Project</ulink> home page.
- </para>
- <para>
- This version of the manual has been specifically packaged in this
-way in an attempt to better suit the needs of people interested only
-in using the Gutenprint software with
-<ulink url="http://www.gimp.org">GIMP</ulink> (GNU Image Manipulation Program).
- </para>
-
- </caution>
-
-</chapter>
-
-&history;
-&gimp;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/gimp.sgml b/doc/users_guide/gimp.sgml
deleted file mode 100644
index d8e5ae3..0000000
--- a/doc/users_guide/gimp.sgml
+++ /dev/null
@@ -1,886 +0,0 @@
-
- <chapter id="ch-gimp-and-gimp-print"><title>GIMP and Gutenprint</title>
-
- <sect1>
- <title>Running the GIMP</title>
- <para>
- This section assumes that you have the GIMP version 1.2 installed
-and working properly on your computer, and that you have an image of
-some type that you desire to print. To get started quickly, log into
-your system, start the X window system, and bring up your favorite terminal
-window. At the $ prompt, type:
-
- <programlisting>
- <![ CDATA [
- $ gimp &
- ]]>
- </programlisting>
-
- This should start the GIMP for you. If it does not, check that
-you have installed the GIMP properly, and that its binary is located
-in one of the directories listed in your &dollar;PATH environment
-variable. On the assumption that this worked, the screen should now
-look something like this:
-
- <figure><title>The Startup Window for The GIMP</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/gimp_startup.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>Startup window for The GIMP</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- </para>
- <para>
- At this point, you should use the
-
- <menuchoice>
- <guimenu>File</guimenu>
- <guimenuitem>Open</guimenuitem>
- </menuchoice>
-
-menu option to open your favorite picture. We will print this picture
-shortly. Your picture should be displayed next to the GIMP startup
-window, perhaps looking similar to the following (sssh! Don't tell
-anybody the secret!):
-
- <figure><title>A Sample Image Displayed by The GIMP</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="50" fileref="figures/gimp_image.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>A Sample Image displayed by The Gimp</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- </para>
-
- </sect1>
-
- <sect1><title>The Gimp-Print Graphical User Interface</title>
- <para>
- Now that the GIMP is displaying your picture, put your mouse over
-the picture and click the right mouse button. A menu will appear.
-Choose the
- <menuchoice>
- <guimenu>File</guimenu>
- <guimenuitem>Print</guimenuitem>
- </menuchoice>
-menu option. This will cause the Gimp-Print GUI window to appear (see
-<xref linkend="fig-gimp-print-gui">). Move the mouse cursor
-over the various parts of the Gimp-Print GUI window, and notice that
-if you leave your mouse in one place for a short time without clicking
-any buttons, a small box appears. This box contains helpful text.
-These small boxes are called "tooltips" and are intended to remind you
-about the function of each part of the graphical interface.
- </para>
- <para>
-The next several sections will continuously refer to
-<xref linkend="fig-gimp-print-gui"> and
-<xref linkend="fig-gimp-print-gui-1">. The difference between
-the two figures can be seen in the top right corner of the window.
-Notice that there are two tabs, one which reads
-<guilabel>Printer Settings</guilabel> and another which reads
-<guilabel>Image/Output Settings</guilabel>. Notice also that the
-window is divided into several major sections which directly map to
-the major sections of this document:
- <itemizedlist>
- <listitem>
- <para><link linkend="sec-preview">Preview</link></para>
- </listitem>
- <listitem>
- <para><link linkend="sec-printer-settings">Printer Settings</link></para>
- </listitem>
- <listitem>
- <para><link linkend="sec-printer-settings">Image/Output Settings</link></para>
- </listitem>
- <listitem>
- <para><link linkend="sec-position">Position</link></para>
- </listitem>
- <listitem>
- <para><link linkend="sec-scaling">Size</link></para>
- </listitem>
- <listitem>
- <para><link linkend="sec-printing-and-saving-settings">Printing and Saving Settings</link></para>
- </listitem>
- </itemizedlist>
- </para>
-
- <figure id="fig-gimp-print-gui"><title>The Gimp-Print Graphical User Interface 1 (GUI)</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="40" fileref="figures/gimp-print-gui.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The GIMP Print GUI showing printer settings</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <figure id="fig-gimp-print-gui-1"><title>The Gimp-Print Graphical User Interface 2 (GUI)</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="40" fileref="figures/gimp-print-gui-1.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The GIMP Print GUI showing image/output settings</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <sect2><title id="sec-printer-settings">Printer Settings</title>
- <indexterm id="idx-printer-settings"><primary>Printer Settings</primary></indexterm>
-
- <sect3><title>Printer</title>
- <para>
- Click on the <guilabel>Printer Settings</guilabel> tab near the
-top right hand corner of the window (see
-<xref linkend="fig-gimp-print-gui">). Then, click on the downward
-facing arrow to the right of the <guilabel>Printer</guilabel> combo
-box to see a list of the system printer queues. Select the queue to which
-you would like the printed image to be sent. One may also print the
-image directly to a file by selecting <guimenuitem>File</guimenuitem>.
-In this event, the user will be prompted for the filename when either the
-<guibutton>Print</guibutton> button or the <guibutton>Print and Save
-Settings</guibutton> button is clicked.
- </para>
- <para>
-When either the <guibutton>Print and Save Settings</guibutton> button
-or the <guibutton>Save Settings</guibutton> button is clicked,
-the settings are saved in a file called
-<filename>~/.gimp-1.2/printrc</filename>. The user is cautioned about
-hand editing this file since it is generated by Gutenprint (although
-it was the only way that the author found for removing bogus entries
-created while playing with the <guibutton>New Printer</guibutton> button).
- </para>
- </sect3>
-
- <sect3><title>Setup Printer</title>
- <para>
- Before any useful printing can occur, the user needs to associate
-the named printer with the
-actual make and model of the printer. Click the
-<guibutton>Setup Printer</guibutton> button in
-the <guilabel>Printer</guilabel> section of the window (the upper
-right, and just below the Printer display box). When this is done, the
-following window appears:
-
- <figure><title>The Setup Printer Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="60" fileref="figures/gimp-print-setup.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The Setup Printer Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
- </para>
-
- <para>
- Scroll through the Printer Model section of the window until you
-find a printer which matches yours. If you cannot find the precise
-model, pick something close and hope for the best. There are selections
-for a wide array of Postscript, inkjet, and laser printers. After you
-have selected a printer, you will see the printer command displayed.
- </para>
- <para>
-The Gutenprint software does all of the necessary conversion of the
-image to be printed into the language of your printer. It is
-unnecessary and undesirable for any other sofware to manipulate this
-data. (This is why the command contains the "-l" switch or the "-o
-raw" switch). Please use care if you feel the need to edit this
-command. Once you are satisfied with your selection, click the
-<guibutton>OK</guibutton> button.
- </para>
-
- </sect3>
-
- <sect3><title>New Printer</title>
-
- <para>
- In the previous sections, the user selected an existing printer
-queue and associated a particular type of printer to that queue. For
-most cases, this is probably all that is required. However, some
-situations might require more detailed control over the handling of
-the printer data.
- </para>
- <para>
- Click the <guibutton>New Printer</guibutton> button to tell the
-software that you wish to create a new name. In this case, the new
-name may actually be an existing printer with different settings that
-you wish to save, or it may simply be a name associated with a
-particular command for handling the printer data. A window will
-appear thus:
-
- <figure><title>The New Printer Window</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="figures/gimp-print-new-printer.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>The New Printer Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- Type a name into the window and click <guibutton>OK</guibutton>
-(or <guibutton>Cancel</guibutton> if you wish not to do this).
-Notice that the new name now appears as the selected <guilabel>Printer</guilabel>.
-As you change settings in the rest of the Gimp-Print GUI, they will be
-associated with this printer name. When the settings are saved,
-they can be recovered easily by simply selecting this named printer
-from the Printer combo box.
- </para>
- <para>
- One example where this feature might be used is as follows. The
-author frequently prints photos on Epson 4x6 photo paper. Note that
-this paper is physically larger than 4x6 and it has perforations on
-all four sides. The author dislikes printing part of the image on the
-perforated parts of the paper which will be removed after
-printing the photo. By selecting the proper scaling percentage,
-printing can be constrained to the 4x6 part of the paper which will
-remain after the perforated sections are removed. The author has
-saved this setting using this feature of the Gutenprint software.
- </para>
-
- </sect3>
-
- <sect3><title>Media Size</title>
- <para>
- The term <emphasis>media</emphasis> refers to paper, card stock,
-envelopes, or whatever you have put into your printer onto which
-something will be printed. Click the arrow to the right of the
-<guilabel>Media Size</guilabel> box to see a long list of different
-sizes of media. Choose the size that matches the media which you have
-loaded into your printer. Once you have made your choice, the drop
-down menu will disappear, and your choice will be shown in the
-<guilabel>Media Size</guilabel> box. The available paper sizes will
-vary depending upon the printer model you have selected.
- </para>
- <para>
- Some printers support arbitrary (within limits!) paper sizes.
- These printers will let you select <emphasis>Custom</emphasis>
- or <emphasis>Roll</emphasis> paper sizes. When you select such a
- printer, one or both of the <guilabel>Dimensions</guilabel> boxes
- will let you enter your paper size (in inches or centimetres). The
- boxes will not let you enter sizes that your printer cannot handle.
- </para>
- </sect3>
-
- <sect3><title>Media Type</title>
- <para>
- The type of media onto which your image will be printed should be
-selected here. Click on the arrow to the right of the <guilabel>Media
-Type</guilabel> box to see a long list of the different types of media
-onto which you may print your image. Media types include such things
-as plain paper, postcards, photo quality paper, transparencies, and
-more! Once you have made your choice, the drop down menu will
-disappear, and your choice will be shown in the <guilabel>Media
-Type</guilabel> box. The choices available will vary depending upon
-the printer model you have selected.
- </para>
- </sect3>
-
- <sect3><title>Media Source</title>
- <para>
- The <guilabel>Media Source</guilabel> box allows the user to
- choose the paper source, sometimes called <emphasis>Input
- Slot</emphasis>, that the paper will be fed from. Many printers
- only have one available input source (such as the standard paper
- tray), in which case this entry will be grayed out. If your printer
- does support multiple input sources, you may specify the source of
- your choice here. Some Epson printers offer a roll feed option in
- addition to the standard paper tray, and many HP LaserJet printers
- have multiple paper trays.
- </para>
- </sect3>
-
- <sect3><title>Ink Type</title>
- <para>
- Some printers offer a choice of different types of ink or ink
- cartridges. Many Canon and Lexmark printers support various
- combinations of cartridges, such as black only, black and color,
- photo color, and so forth. Most Epson printers let you choose
- between three and four color printing (three color uses only color
- ink, while four color uses black ink as well). Epson printers that
- support six color photo printing allow you to choose five and six
- color printing as well.
- </para>
- </sect3>
-
- <sect3><title>Resolution</title>
- <para>
- Click on the arrow to the right of the
-<guilabel>Resolution</guilabel> box to see a long list of resolutions
-at which you can print your image. The list is written with the
-lowest resolution at the top, with increasing resolution (and
-generally improved printing quality) as you approach the bottom of the
-list. Different printers support different resolution options, and
-many printers support different quality choices using the same basic
-resolution. In this menu are a few terms which may be unfamiliar to
-you, and they will now be explained.
- </para>
- <sect4><title>DPI</title>
- <para>
- DPI is an acronym which stands for <emphasis>D</emphasis>ots
-<emphasis>P</emphasis>er <emphasis>I</emphasis>nch. This term refers
-to the number of dots that your printer will print in a space of one
-inch (approximately 2.54 cm). This is highly dependent upon the
-capability of your printer. Resolutions below 300 DPI are
-used for draft quality. For general purpose printing, select
-300 - 360 DPI. Higher quality printing can be achieved by
-selecting 600 - 720 DPI. Settings higher than this are used for the
-highest possible quality for printing photographs and other high
-quality graphics. Experiment with your printer and these settings
-with different types of graphics and photographs to see what
-results you can obtain with your printer. High resolutions (large
-numbers of dots per inch) require substantial image processing time,
-and the print files can be very large; it's not uncommon for a full
-page, 1440x720 DPI image to require 100 MB of temporary storage!
- </para>
- </sect4>
- <sect4><title>Draft or Fast Economy Draft</title>
- <para>
- When this text appears next to the resolution, it refers to the
-fact that the quality will be relatively low, but suitable for rough
-drafts. Draft quality is higher than fast economy draft. These
-options will give you the fastest printing speed. Economy Draft uses
-less ink, and as a result the image will be pale. These modes are
-generally not very useful for printing photographs.
- </para>
- </sect4>
-
- <sect4><title>Unidirectional</title>
- <para>
- When printing an image, you have probably noticed the print
-head inside the printer moving back and forth across the print media.
-Many printers are capable of putting ink on the page regardless of
-which direction the print head is moving. However, quality can
-sometimes be improved by only putting ink on the page when the printer
-head is moving in one direction. The
-<guimenuitem>Unidirectional</guimenuitem> setting instructs the
-software to only place ink on the page when the print head is moving
-one way. When the print head returns, it will not place ink on the
-page. On many printers, the print quality is better, at the expense
-of printing speed.
- </para>
- </sect4>
- <sect4><title>High(est) Quality</title>
- <para>
- With lower quality print modes, one may see an effect where
-the printed image looks like it has rows of stripes with a small
-separation between the stripes. This effect is called "banding" and
-is undesirable. In the <emphasis>high</emphasis> and
-<emphasis>highest</emphasis> quality modes, the printer will make more
-passes over the same part of the page in order to improve quality and
-(reduce or) eliminate banding. This requires more temporary disk
-space and prints more slowly, but does not require significantly more
-processing time.
- </para>
- </sect4>
- <sect4><title>DMT</title>
- <para>
- DMT is an acronym which stands for <emphasis>D</emphasis>ot
- <emphasis>M</emphasis>odulation
- <emphasis>T</emphasis>echnology.
- This term refers to a print mode used by certain Canon printers
- to improve the quality of the printed output. Unfortunately,
- at this time, all of the available DMT modes do not work
- correctly. The cases which do work correctly will offer
- significantly improved printing quality.
- </para>
- </sect4>
- </sect3>
- </sect2>
-
- <sect2><title id="sec-preview">Preview</title>
- <para>
- Notice in the upper left of the window is a preview of your image.
-This preview is a representation of where your picture will print on
-the selected media, and approximately what it will look like. This
-preview will be updated as you modify selections in the
-<guilabel>Position</guilabel>, <guilabel>Size</guilabel>,
-<guilabel>Media Size</guilabel>, and <guilabel>Output Type</guilabel>
-portions of the window. You may also select the image with your mouse
-and move it manually if you wish. In doing so, you will note that the
-<guilabel>Position</guilabel> settings are updated accordingly. Take
-note of the arrow, which points toward the top of the media, where top
-is the first part of the media to enter the printer.
- </para>
- <para>
- The preview may be moved around the page as follows:
- </para>
- <itemizedlist>
- <listitem><para> Clicking and dragging the <emphasis>left</emphasis>
- (primary) mouse button moves the image around the page as you would
- expect; the image moves with the mouse. </para></listitem>
- <listitem><para> Clicking and dragging the
- <emphasis>middle</emphasis> mouse button moves the image around the
- page in a finer fashion, such that each pixel of mouse movement
- moves the image by one point (1/72 inch). This allows very fine
- placement of the image on the page. </para></listitem>
- <listitem><para> Clicking and dragging the
- <emphasis>right</emphasis> (secondary) mouse button moves the image
- around the page much the same as with the left button, but the image
- will only move in units of the image size. Thus, if the image is
- one inch wide and two inches tall, the image will not move at all
- until you have moved the mouse far enough so that the image would be
- moved one inch vertically and two inches horizontally. This is
- handy if you wish to print multiple images of the same size on one
- piece of paper.</para></listitem>
- <listitem><para> If you hold down the <emphasis>shift</emphasis> key
- on the keyboard when you click and drag the mouse, the image will
- only move in the horizontal or vertical direction (depending upon
- which way you first move the mouse). This allows you to constrain
- motion to the horizontal or vertical. </para></listitem>
- <listitem><para> If you click another button while dragging the
- mouse, the image will immediately return to the position it was in
- before you clicked the mouse the first time. This allows you to
- not move the image if you have started moving it and have decided
- that you don't want to move it. The preview will not respond to the
- mouse until you release all of the mouse buttons and click and drag
- afresh. </para></listitem>
- </itemizedlist>
- </sect2>
-
- <sect2><title id="sec-position">Position</title>
-
- <sect3><title>Orientation</title>
- <para>
- The Orientation menu allows the user to choose the orientation
-of the paper. The menu selections are
-<guimenuitem>Auto</guimenuitem>, <guimenuitem>Portrait</guimenuitem>,
-<guimenuitem>Landscape</guimenuitem>, <guimenuitem>Upside
-down</guimenuitem>, and <guimenuitem>Seascape</guimenuitem>. Click on
-the rectangular tab to see these choices
-and make your selection. When you have done so, the pulldown menu
-will have disappeared, and your choice will appear. Also, note that
-the preview image will have changed accordingly.
- </para>
- <para>
- When set to <guimenuitem>Auto</guimenuitem>, the software will make an
-intelligent choice of orientation based on the dimensions of the image
-to be printed. <guimenuitem>Portrait</guimenuitem> orients the print media
-with the longest edge going from top to bottom, while
-<guimenuitem>Landscape</guimenuitem> orients the paper with the longest edge
-going from side to side. <guimenuitem>Upside down</guimenuitem> and
-<guimenuitem>Seascape</guimenuitem> orient the paper the same as
-<guimenuitem>Portrait</guimenuitem> and <guimenuitem>Landscape</guimenuitem>
-respectively, with the difference being that the image is rotated 180 degrees.
- </para>
- </sect3>
-
- <sect3><title>Automatic Centering</title>
- <para>
- There are three buttons that deal with centering an image. The
-leftmost button is the <guibutton>Vertically</guibutton> button, the
-middle button is the <guibutton>Both</guibutton> button, and
-the rightmost button is the <guibutton>Horizontally</guibutton>
-button. Use the <guibutton>Both</guibutton> button to center your
-image both horizontally and vertically. This will cause the top and
-bottom borders to be equal, and the left and right borders to be
-equal. If you have placed your image manually by using the mouse
-button, then you may center the image in the horizontal direction only
-by clicking on the <guibutton>Horizontally</guibutton> button.
-Likewise, to adjust the image only in the vertical direction, click on
-the <guibutton>Vertically</guibutton> button. Note that in
-each case, the image is centered with regard to the edges of the
-media, and without regard to the printable portion of the media. Many
-printers are incapable of printing to each edge of the media. Some
-media may have edges which detach. Consult your printer documentation
-for more details regarding your printer's capabilities in this regard.
- </para>
- </sect3>
-
- <sect3><title>Manual Settings</title>
- <para>
- You will notice that there are six boxes that contain numbers
-just below the Orientation menu and just above the GUI buttons related
-to centering an image. When you move the preview image manually with
-the mouse, or when you click on one of the centering buttons, the
-preview image moves and these six boxes get updated.
- </para>
- <sect4><title>Left</title>
- <para>
- The number appearing in the <guimenuitem>Left</guimenuitem> box denotes
-the number of units (cm or inches) that the left side of the image
-will be printed away from the left edge of the media. You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the <guilabel>Units</guilabel> section just below
-these GUI boxes.
- </para>
- </sect4>
- <sect4><title>Right</title>
- <para>
- The number appearing in the <guimenuitem>Right</guimenuitem> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the left edge of the media. You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the <guilabel>Units</guilabel> section just below
-these GUI boxes.
- </para>
- </sect4>
- <sect4><title>Right Border</title>
- <para>
- The number appearing in the <guimenuitem>Right Border</guimenuitem> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the right edge of the media. You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the <guilabel>Units</guilabel> section just below
-these GUI boxes.
- </para>
- </sect4>
- <sect4><title>Top</title>
- <para>
- The number appearing in the <guimenuitem>Top</guimenuitem> box denotes
-the number of units (cm or inches) that the top side of the image
-will be printed away from the top edge of the media. You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the <guilabel>Units</guilabel> section just below
-these GUI boxes.
- </para>
- </sect4>
- <sect4><title>Bottom</title>
- <para>
- The number appearing in the <guimenuitem>Bottom</guimenuitem> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the top edge of the media. You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the <guilabel>Units</guilabel> section just below
-these GUI boxes.
- </para>
- </sect4>
-
- <sect4><title>Bottom Border</title>
- <para>
- The number appearing in the <guimenuitem>Bottom Border</guimenuitem> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the bottom edge of the media. You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the <guilabel>Units</guilabel> section just below
-these GUI boxes.
- </para>
- </sect4>
-
- </sect3>
-
- </sect2>
-
- <sect2><title id="sec-scaling">Size</title>
-
- <sect3><title>Slider Bar and Spin Box</title>
- <para>
- The slider bar can be moved as desired by the user. Notice
-that while sliding this bar, the preview image changes accordingly.
-One will also note that several boxes in the Gimp-Print GUI change values when this bar is moved.
-These boxes are the six position boxes (left, right, right border,
-top, bottom, bottom border), the two size boxes (width and height),
-and the spin box to the right of the slider bar.
- </para>
- <para>
- This slider bar is used to scale the image to a desirable size, but the same effect can
-be obtained by either clicking an arrow on the spin box to the right of this
-slider bar, or by manually typing a number into this spin box. Notice
-that by setting the spin box in this way, the slider bar is also
-moved. All of the described methods will cause the image to be
-scaled accordingly.
- </para>
- </sect3>
-
- <sect3><title>Scale by Percent or PPI</title>
- <para>
- One may choose to scale the image by a percentage, or by PPI,
-which means "<emphasis>p</emphasis>ixels <emphasis>p</emphasis>er
-<emphasis>i</emphasis>nch". Click the radio button
-next to the word to set the desired scaling factor.
- </para>
- <para>
- When scaling by a percentage, the number reflected in the spin
-box next to the slider bar represents the percentage relative
-to the full size of the selected print medium. For example, with this spin box
-set to 50, the image will be scaled to 50% of the size of the print
-medium. When set to 100, the image will attempt to fill the print
-medium, within the constraints of maintaining the proper aspect ratio
-and the margins of the selected print medium. This effect can be seen
-in the preview window.
- </para>
- <para>
- When scaling by PPI, the number reflected in the spin box next to
-the slider bar represents the number of pixels that will be
-printed per inch. For example, if the user is printing a 640x480
-image at a size of 6.4x4.8 inches (as measured by the size boxes), the
-image will be printed at 100 DPI.
- </para>
- </sect3>
-
- <sect3><title>Use Original Image Size</title>
- <para>
- By clicking this button, the image will be scaled to as close
-to the native size of the image as possible. This effect can
-immediately be seen in the preview image.
- </para>
- <para>
- The native image size may be found or set in the GIMP by
- selecting <guimenuitem>Image/Scale Image</guimenuitem> in the
- GIMP. Under the <guilabel>Print Size and Display Unit</guilabel>
- group in the <guilabel>Scale Image</guilabel> dialog, you can
- determine (or change) the width and height of the image, or
- choose the resolution.
- </para>
- </sect3>
-
- <sect3><title>Width and Height</title>
- <para>
- These boxes show the size of the printed image in either inches
-or centimeters (depending on which unit is selected). The user may
-choose to manually modify these values. When one value is modified,
-the other value is automatically modified in order to maintain the
-aspect ratio (the ratio of width to height). This effect can be
-immediately seen in the preview image.
- </para>
- </sect3>
-
- <sect3><title>Units</title>
- <para>
- The units can be set to inches or centimeters by clicking the appropriate
-radio button next to the desired unit. This setting effects the
-values printed in the six position boxes (left, right, right border,
-top, bottom, bottom border) and the two size boxes (width and height).
- </para>
- </sect3>
-
- </sect2>
-
- <sect2><title id="sec-image-settings">Image/Output Settings</title>
- <para>
- By clicking on the tab labeled <guilabel>Image/Output
-Settings</guilabel>, the Gimp-Print window will appear as shown in
-<xref linkend="fig-gimp-print-gui-1">. Notice that there are
-two sections to this portion of the window, namely,
-<guilabel>Image Type</guilabel> and
-<guilabel>Output Type</guilabel>.
-
- </para>
-
- <sect3><title>Image Type</title>
-
- <sect4><title>Line Art</title>
- <para>
- This setting tells the printer driver to generate color
-quickly. The color is bold and bright, but color accuracy is not very
-good. There may also be some unexpectedly sharp transitions in
-colors. This mode is acceptable for printing text with small amounts
-of color, and may be acceptable for presentation graphics.
- </para>
- </sect4>
-
- <sect4><title>Solid Colors</title>
- <para>
- This mode produces color which is considerably more accurate
-than the <guilabel>Line Art</guilabel> mode, but with a reduction in performance. In
-general, hues will be accurate but tonalities may not be accurate.
-There should be no sharp transitions in colors. This mode is good for
-printing presentation graphics in most cases.
- </para>
- </sect4>
-
- <sect4><title>Photograph</title>
- <para>
- This mode produces the most accurate colors and tonalities at a
-greater cost in performance. This is the mode to use when printing
-high quality photographs or other high quality images.
- </para>
- </sect4>
-
- </sect3>
-
- <sect3><title>Output Type</title>
- <para>
- The user is given the choice of color, black and white, and
-grayscale. Color is selected when the desired output is to be in
-color. Greyscale will result in the printed image having various
-shades of grey. Black and white is just that. The effect of this
-setting can be seen in the preview window.
- </para>
- </sect3>
-
- <sect3><title>Adjust Output</title>
- <para>
- Clicking on this button causes the <guilabel>Print Color Adjust</guilabel> window to
-appear (see <xref linkend="fig-gimp-print-color-adjust">). In
-this window, one will see a representation of the image to be printed
-as well as several slider bars. These slider bars collectively adjust
-many different aspects of the image. The values can also be adjusted
-by clicking the arrows or by typing a value into the appropriate spin
-box on the right side of each slider bar.
- </para>
-
- <figure id="fig-gimp-print-color-adjust"><title>The Print Color Adjust Window</title>
- <mediaobject>
- <imageobject>
- <imagedata scale="50" fileref="figures/gimp-print-print-color-adjust.png" FORMAT="PNG">
- </imageobject>
- <textobject>
- <phrase>>The Print Color Adjust Window</phrase>
- </textobject>
- </mediaobject>
- </figure>
-
- <sect4><title>Brightness</title>
- <para>
- Adjust the brightness of the image. A setting of 0.0 gives a fully black
-image, while a 2.0 setting gives a fully white image. Values greater than 1.0 will result in
- black not being solid and highlights turning white; values less than
- 1.0 will result in white not being perfectly clear and shadows turning
- black.
- </para>
- </sect4>
-
- <sect4><title>Contrast</title>
- <para>
- Adjust the contrast of the image. A setting of 0.0 gives a solid gray for the
-entire image, the exact gray depending upon the brightness chosen.
- </para>
- </sect4>
-
- <sect4><title>Cyan, Magenta, Yellow</title>
- <para>
-These three options allow specification of the cyan, magenta, and
-yellow levels independently, for rebalancing the levels. Normally,
-these should be adjusted to yield neutral gray, but they can be used
-for other effects.
- </para>
- </sect4>
-
- <sect4><title>Saturation</title>
- <para>
-Adjust the brilliance of colors. A setting of 0.0 results in pure grayscale.
-A saturation setting of less than 1.0 results in more muted colors. A
-saturation setting of greater than 1.0 results in more vibrant colors. Very high
-saturation often results in very strange effects, including
-posterization and banding that might not be expected. For normal
-purposes, the saturation should generally be set to a value less than 1.5.
- </para>
- </sect4>
-
- <sect4><title>Density</title>
- <para>
-Adjust the amount of ink deposited on the paper. If you have chosen the
-correct paper type and are getting ink bleeding through the paper
-or puddling, try reducing the density to the lowest value you
-can while still achieving solid black. If black is not solid
-black, even with the contrast and brightness at 1.0, try increasing
-the density. Note that changes to this setting will not be visible in
-the image preview.
- </para>
- <para>
-All of the supported printers actually need less than 100% ink
-density in most cases, so the actual density is something other than
-the nominal density setting. The effective density setting cannot go
-above 100%, so if a value specified will result in an excessively high
-density level, it will be silently limited to a setting of 1.0.
- </para>
- </sect4>
-
- <sect4><title>Gamma</title>
- <para>
-Adjust the gamma of the image, over and above the printer-specific
-correction. Gamma less than 1.0 will result in a darker image; gamma
-greater than 1.0 will result in a lighter image. Unlike brightness,
-gamma adjustment does not change the endpoints; it merely changes the
-shape of the input->output curve.
- </para>
- </sect4>
-
- <sect4><title>Dither Algorithm</title>
- <para>
-The recommended dither algorithm is <guimenuitem>Adaptive
-Hybrid</guimenuitem> (which is the default) for text or other fine
-black detail, or if this is mixed with continuous tone images. The
-<guimenuitem>Ordered</guimenuitem> dithering algorithm is just as good
-(and somewhat faster) for pure continuous-tone images and photographs,
-but may yield poor results with text or other fine detail,
-particularly at high printing resolutions.
- </para>
- <para> The <guimenuitem>Fast</guimenuitem> algorithm gives the
-fastest results at the expense of color accuracy. It is a simplified
-ordered dither. On simple four color printers (or other printers used
-in four color mode), the quality is similar to
-<guimenuitem>Ordered</guimenuitem>, although dark gray rendition is
-not as good due to a simpler transfer between black and colored ink.
-With six-color printers, color rendition is somewhat worse, but it
-should be quite usable in cases where optimum quality is not critical.
-In black and white, it is an efficient way to render grayscale, but it
-may not give best results when used with variable dot size printers
-(modern Epson printers, or Canon printers using DMT). On rare three
-color printers (CMY only) the results should be identical to ordered
-dither.
- </para>
- <para> <guimenuitem>Very Fast</guimenuitem> is even faster than
-<guimenuitem>Fast</guimenuitem>, with even more loss of quality.
-Color and grayscale output will show strong patterning that resembles
-screening, although it isn't. On laser printers, and possibly on
-certain kinds of text and line art, <guimenuitem>Very
-Fast</guimenuitem> dithering may actually yield the best quality.
- </para>
- <para>
-Error diffusion algorithms (<guimenuitem>Hybrid
-Floyd-Steinberg</guimenuitem> is such an algorithm) perform very well
-at high densities, and are capable of
-rendering very fine detail rather well, but they tend to exhibit artifacts in
-the form of "waves" or "worms" of dots which results in noticeable
-texturing in pale areas. Furthermore, pale areas immediately adjacent
-to white take a while to "build up" sufficient error to print at all.
-This is sometimes called "tearing" or "waterfalling".
- </para>
-
- </sect4>
-
- <sect4><title>Set Defaults and Close</title>
- <para>
- When the <guibutton>Set Defaults</guibutton> button is clicked,
-the slider bar settings will return to their default values. The
-dither algorithm setting is uneffected. The <guilabel>Print Color
-Adjust</guilabel> window will close when the
-<guibutton>Close</guibutton> button is clicked.
- </para>
- </sect4>
-
- </sect3>
-
- </sect2>
-
- <sect2><title id="sec-printing-and-saving-settings">Printing and Saving Settings</title>
- <para>
- At the bottom of the Gimp-Print window, there are five buttons labeled
-<guibutton>About</guibutton>,
-<guibutton>Print and Save Settings</guibutton>,
-<guibutton>Save Settings</guibutton>,
-<guibutton>Print</guibutton>,
-and <guibutton>Cancel</guibutton>. The <guibutton>About</guibutton>
-button will show information about the Gutenprint software, such as
-the version number, authors names, project web site, and software
-licensing. After clicking on the <guibutton>About</guibutton>, read
-the information, and then close the window by pressing the
-<guibutton>OK</guibutton> button.
- </para>
- <para>
- The <guibutton>Print and Save Settings</guibutton> button will
-save the current settings and then print the desired image. Recall
-that these settings are saved in <filename>~/.gimp-1.2/printrc</filename>. The
-<guibutton>Save Settings</guibutton> button will only save the
-settings. The <guibutton>Print</guibutton> button will print the
-image only. The <guibutton>Cancel</guibutton> will close the
-Gimp-Print GUI window.
- </para>
- </sect2>
-
- </sect1>
-
- </chapter>
diff --git a/doc/users_guide/history.sgml b/doc/users_guide/history.sgml
deleted file mode 100644
index 2782f2b..0000000
--- a/doc/users_guide/history.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-
- <chapter><title>Project History</title>
- <para>
-This software package was first written by Michael Sweet of
-<ulink url="http://www.easysw.com">Easy Software Products</ulink> and
-initially worked only as a print plugin to the GIMP (GNU Image
-Manipulation Program). In the summer of 1999,
-Robert Krawitz (the current
-Gutenprint project leader) purchased an Epson Stylus Photo EX printer
-to feed his photography hobby. Finding no existing printer drivers, Robert
-adapted Mike's GIMP Print plugin to his six-color printer, and by the end
-of the year released version 3.0 of the Gimp-Print software, which was
-included in version 1.1 of the GIMP. The intention was for this to be
-the stable plugin in version 1.2 of the GIMP while development of the
-GIMP Print plugin continued for later release.
- </para>
- <para>
-Robert put the Gimp-Print development tree on SourceForge starting
-with version 3.1, and quickly found a group of like-minded people who wanted to print
-high quality output on inexpensive inkjet printers. One of the main
-goals, which was not expected to be met until late in the version 3.1
-cycle, was to write a Ghostscript driver so that printing would not be
-restricted to the GIMP. Imagine Robert's surprise when Henryk "Buggs"
-Richter wrote one within days!
- </para>
- <para>
-In July 2000, not more than a year after Robert bought his Epson
-Stylus Photo EX, he was invited to the Linux Printing
-Summit hosted by VA Linux Systems. In preparation for that, he spent
-long hours printing out test images. Robert went back to the
-Gimp-Print version 3.0.9 release, which seemed like such an advance
-at the time, and was floored at how far the project had come in four
-months! Output that had been considered impressive with using six
-colors was put to shame by four color output. That should give you
-an idea what six color and variable dot size printers can do. It also
-illustrates what a group of committed people can do.
- </para>
- <para>
-Robert came away from the Printing Summit with a lot of new ideas, and in
-November 2000, Gimp-Print version 4.0 was released, the culmination of 9 months
-of work by the team. The quality was already tremendously improved
-over what the software could do at the Printing Summit.
- </para>
- <para>
-The team started serious work on version 4.1 in December
-2000, and version 4.2.0 was released in November 2001. Despite the fact
-that version 4.2.0 is a "minor" release over version 4.0, there are vast
-improvements:
- <itemizedlist>
- <listitem>
- <para>
- The driver is built as a shared library, making it much easier
-to use by higher layers of software
- </para>
- </listitem>
- <listitem>
- <para>
- The packaging system now follows GNU standards
- </para>
- </listitem>
- <listitem>
- <para>
-The print quality (in particular, color accuracy, a well-known weakness in 4.0) is even better
- </para>
- </listitem>
- <listitem>
- <para>
- Improved performance
- </para>
- </listitem>
- <listitem>
- <para>
- Many more options
- </para>
- </listitem>
- <listitem>
- <para>
- More supported printers
- </para>
- </listitem>
-
- </itemizedlist>
-
- </para>
- <para>
-Releases of Gimp-Print have been historically numbered in
-a fashion similar to that of the Linux kernel, where major releases
-are denoted by the first digit (in this case '4'), while minor
-releases are denoted by subsequent digits (such as '4.2.0'). Even
-numbered minor releases are considered stable, while odd numbered
-minor releases are considered development releases (whose stability
-may vary for any given release).
- </para>
- <para>
-This project is by no means finished. In future releases, the development
-team hopes to include the following:
- <itemizedlist>
- <listitem><para>implementation of proper color management</para></listitem>
- <listitem><para>improved dithering</para></listitem>
- <listitem><para>improvements in performance</para></listitem>
- </itemizedlist>
- </para>
- <para>
-The entire Gutenprint team hopes you will really enjoy using this
-software! For more information, please consult the Gutenprint project
-<ulink url="http://gimp-print.sourceforge.net">web page</ulink>.
- </para>
- </chapter>
diff --git a/doc/users_guide/html-stamp b/doc/users_guide/html-stamp
deleted file mode 100644
index e69de29..0000000
--- a/doc/users_guide/html-stamp
+++ /dev/null
diff --git a/doc/users_guide/html/book1.html b/doc/users_guide/html/book1.html
deleted file mode 100644
index 09f72ed..0000000
--- a/doc/users_guide/html/book1.html
+++ /dev/null
@@ -1,487 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->The User's Guide to Gutenprint - Complete Edition</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="NEXT"
-TITLE="Project History"
-HREF="c29.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="BOOK"
-><DIV
-CLASS="BOOK"
-><A
-NAME="AEN1"
-></A
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="TITLE"
-><A
-NAME="AEN2"
->The User's Guide to Gutenprint - Complete Edition</A
-></H1
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN6"
-></A
->Andy Stewart</H3
-><P
-CLASS="COPYRIGHT"
-><A
-HREF="ln12.html"
->Copyright</A
-> &copy; 2002 Andy Stewart</P
-><DIV
-><DIV
-CLASS="ABSTRACT"
-><P
-></P
-><A
-NAME="AEN16"
-></A
-><P
-> The Gutenprint Top Quality Printer Drivers (hereafter
-called Gutenprint) are a set of printer drivers written to
-take advantage of the full capabilities of a wide range of
-printers. These drivers should work on any POSIX compliant operating
-system (e.g. Linux, Solaris, IRIX, etc). This document will explain how to
-use the Gutenprint software to achieve high quality printouts from the
-<A
-HREF="http://www.gimp.org"
-TARGET="_top"
->GIMP</A
-> (GNU Image
-Manipulation Program) and
-<A
-HREF="http://www.cups.org"
-TARGET="_top"
->CUPS</A
-> (Common Unix Printing
-System).
- </P
-><P
-> Please note that in addition to using the Gutenprint software as a
-print plugin for the GIMP, and as a set of printer drivers for CUPS, this
-software can also be compiled and used with the
-<A
-HREF="http://www.ghostscript.com"
-TARGET="_top"
->Ghostscript</A
-> software
-and with the
-<A
-HREF="http://www.linuxprinting.org/foomatic.html"
-TARGET="_top"
->Foomatic</A
->
-software.
- </P
-><P
->Regardless of whether the Gutenprint software is used with the GIMP,
-CUPS, Ghostscript, or Foomatic, the print quality and printer settings
-remain the same. However, use of the Gutenprint with Ghostscript and
-Foomatic is not covered in this document. These topics may be covered
-in a future revision of this document.
- </P
-><P
-> This document corresponds to version 4.2.0 and later of the Gutenprint
-software. This document will serve as a guide to the user, and as such
-will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
-Foomatic, or any other related software.
- </P
-><P
-> Andy Stewart, the author, is the founder of the
-<A
-HREF="http://www.wlug.org"
-TARGET="_top"
->Worcester Linux Users' Group</A
-> in
-Worcester, Massachusetts, USA. The group was founded in July 1997 and has
-approximately 140 people on its mailing list. Monthly meetings are
-held and all are invited.
- </P
-><P
-> In terms of "code", this is the author's first contribution to the
-open source community, and definitely his first experience with DocBook.
-Constructive comments, praise, words of encouragement, and the like
-will be most appreciated if e-mailed to the
-<A
-HREF="mailto:andystewart@attbi.com"
-TARGET="_top"
->author</A
->.
- </P
-><P
-></P
-></DIV
-></DIV
-><HR></DIV
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->1. <A
-HREF="c29.html"
->Project History</A
-></DT
-><DT
->2. <A
-HREF="ch-gimp-and-gimp-print.html"
->GIMP and Gutenprint</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="ch-gimp-and-gimp-print.html#AEN63"
->Running the GIMP</A
-></DT
-><DT
-><A
-HREF="x85.html"
->The Gimp-Print Graphical User Interface</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="x85.html#AEN130"
->Printer Settings</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN230"
->Preview</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN254"
->Position</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN326"
->Size</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN353"
->Image/Output Settings</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN426"
->Printing and Saving Settings</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->3. <A
-HREF="c443.html"
->CUPS and Gutenprint</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="c443.html#AEN445"
->Introduction</A
-></DT
-><DT
-><A
-HREF="x452.html"
->CUPS Printer Installation</A
-></DT
-><DT
-><A
-HREF="x544.html"
->Configuring your Printer in CUPS</A
-></DT
-><DT
-><A
-HREF="x559.html"
->Using CUPS from the Command Line</A
-></DT
-></DL
-></DD
-><DT
->4. <A
-HREF="c568.html"
->Gutenprint Utilities</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="c568.html#AEN570"
->escputil</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="c568.html#AEN582"
->Determining Ink Level</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN591"
->Error During Ink Level Determination</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN595"
->Nozzle Check</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN600"
->Clean the Print Head</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN606"
->Align the Print Head</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN622"
->Printer Identification</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN626"
->More Information</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->A. <A
-HREF="gfdl.html"
->GNU Free Documentation License</A
-></DT
-><DD
-><DL
-><DT
->0. <A
-HREF="gfdl.html#AEN635"
->PREAMBLE</A
-></DT
-><DT
->1. <A
-HREF="x640.html"
->APPLICABILITY AND DEFINITIONS</A
-></DT
-><DT
->2. <A
-HREF="x650.html"
->VERBATIM COPYING</A
-></DT
-><DT
->3. <A
-HREF="x654.html"
->COPYING IN QUANTITY</A
-></DT
-><DT
->4. <A
-HREF="x660.html"
->MODIFICATIONS</A
-></DT
-><DT
->5. <A
-HREF="x696.html"
->COMBINING DOCUMENTS</A
-></DT
-><DT
->6. <A
-HREF="x701.html"
->COLLECTIONS OF DOCUMENTS</A
-></DT
-><DT
->7. <A
-HREF="x705.html"
->AGGREGATION WITH INDEPENDENT WORKS</A
-></DT
-><DT
->8. <A
-HREF="x709.html"
->TRANSLATION</A
-></DT
-><DT
->9. <A
-HREF="x712.html"
->TERMINATION</A
-></DT
-><DT
->10. <A
-HREF="x715.html"
->FUTURE REVISIONS OF THIS LICENSE</A
-></DT
-><DT
-><A
-HREF="x720.html"
->How to use this License for your documents</A
-></DT
-></DL
-></DD
-></DL
-></DIV
-><DIV
-CLASS="LOT"
-><DL
-CLASS="LOT"
-><DT
-><B
->List of Figures</B
-></DT
-><DT
->2-1. <A
-HREF="ch-gimp-and-gimp-print.html#AEN67"
->The Startup Window for The GIMP</A
-></DT
-><DT
->2-2. <A
-HREF="ch-gimp-and-gimp-print.html#AEN78"
->A Sample Image Displayed by The GIMP</A
-></DT
-><DT
->2-3. <A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->The Gimp-Print Graphical User Interface 1 (GUI)</A
-></DT
-><DT
->2-4. <A
-HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
->The Gimp-Print Graphical User Interface 2 (GUI)</A
-></DT
-><DT
->2-5. <A
-HREF="x85.html#AEN153"
->The Setup Printer Window</A
-></DT
-><DT
->2-6. <A
-HREF="x85.html#AEN168"
->The New Printer Window</A
-></DT
-><DT
->2-7. <A
-HREF="x85.html#FIG-GIMP-PRINT-COLOR-ADJUST"
->The Print Color Adjust Window</A
-></DT
-><DT
->3-1. <A
-HREF="x452.html#AEN456"
->The CUPS Startup Window</A
-></DT
-><DT
->3-2. <A
-HREF="x452.html#AEN466"
->The CUPS Printers Window</A
-></DT
-><DT
->3-3. <A
-HREF="x452.html#AEN475"
->The CUPS Admin Window</A
-></DT
-><DT
->3-4. <A
-HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
->The CUPS Admin Device Window</A
-></DT
-><DT
->3-5. <A
-HREF="x452.html#AEN494"
->The CUPS Admin Model/Driver Window</A
-></DT
-><DT
->3-6. <A
-HREF="x452.html#FIG-CUPS-ADMIN-MODEL"
->The 2nd CUPS Admin Model/Driver Window</A
-></DT
-><DT
->3-7. <A
-HREF="x452.html#AEN526"
->The CUPS Admin Success Window</A
-></DT
-><DT
->3-8. <A
-HREF="x452.html#FIG-CUPS-MY-PRINTER"
->The CUPS Window for Your Printer</A
-></DT
-><DT
->3-9. <A
-HREF="x544.html#FIG-CUPS-PRINTER-CONFIG-WINDOW"
->The CUPS Printer Cofiguration Window</A
-></DT
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="c29.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Project History</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/c29.html b/doc/users_guide/html/c29.html
deleted file mode 100644
index aff4370..0000000
--- a/doc/users_guide/html/c29.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Project History</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="NEXT"
-TITLE="GIMP and Gutenprint"
-HREF="ch-gimp-and-gimp-print.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="book1.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AEN29"
-></A
->Chapter 1. Project History</H1
-><P
->This software package was first written by Michael Sweet of
-<A
-HREF="http://www.easysw.com"
-TARGET="_top"
->Easy Software Products</A
-> and
-initially worked only as a print plugin to the GIMP (GNU Image
-Manipulation Program). In the summer of 1999,
-Robert Krawitz (the current
-Gutenprint project leader) purchased an Epson Stylus Photo EX printer
-to feed his photography hobby. Finding no existing printer drivers, Robert
-adapted Mike's GIMP Print plugin to his six-color printer, and by the end
-of the year released version 3.0 of the Gimp-Print software, which was
-included in version 1.1 of the GIMP. The intention was for this to be
-the stable plugin in version 1.2 of the GIMP while development of the
-GIMP Print plugin continued for later release.
- </P
-><P
->Robert put the Gimp-Print development tree on SourceForge starting
-with version 3.1, and quickly found a group of like-minded people who wanted to print
-high quality output on inexpensive inkjet printers. One of the main
-goals, which was not expected to be met until late in the version 3.1
-cycle, was to write a Ghostscript driver so that printing would not be
-restricted to the GIMP. Imagine Robert's surprise when Henryk "Buggs"
-Richter wrote one within days!
- </P
-><P
->In July 2000, not more than a year after Robert bought his Epson
-Stylus Photo EX, he was invited to the Linux Printing
-Summit hosted by VA Linux Systems. In preparation for that, he spent
-long hours printing out test images. Robert went back to the
-Gimp-Print version 3.0.9 release, which seemed like such an advance
-at the time, and was floored at how far the project had come in four
-months! Output that had been considered impressive with using six
-colors was put to shame by four color output. That should give you
-an idea what six color and variable dot size printers can do. It also
-illustrates what a group of committed people can do.
- </P
-><P
->Robert came away from the Printing Summit with a lot of new ideas, and in
-November 2000, Gimp-Print version 4.0 was released, the culmination of 9 months
-of work by the team. The quality was already tremendously improved
-over what the software could do at the Printing Summit.
- </P
-><P
->The team started serious work on version 4.1 in December
-2000, and version 4.2.0 was released in November 2001. Despite the fact
-that version 4.2.0 is a "minor" release over version 4.0, there are vast
-improvements:
- <P
-></P
-><UL
-><LI
-><P
-> The driver is built as a shared library, making it much easier
-to use by higher layers of software
- </P
-></LI
-><LI
-><P
-> The packaging system now follows GNU standards
- </P
-></LI
-><LI
-><P
->The print quality (in particular, color accuracy, a well-known weakness in 4.0) is even better
- </P
-></LI
-><LI
-><P
-> Improved performance
- </P
-></LI
-><LI
-><P
-> Many more options
- </P
-></LI
-><LI
-><P
-> More supported printers
- </P
-></LI
-></UL
->
-
- </P
-><P
->Releases of Gimp-Print have been historically numbered in
-a fashion similar to that of the Linux kernel, where major releases
-are denoted by the first digit (in this case '4'), while minor
-releases are denoted by subsequent digits (such as '4.2.0'). Even
-numbered minor releases are considered stable, while odd numbered
-minor releases are considered development releases (whose stability
-may vary for any given release).
- </P
-><P
->This project is by no means finished. In future releases, the development
-team hopes to include the following:
- <P
-></P
-><UL
-><LI
-><P
->implementation of proper color management</P
-></LI
-><LI
-><P
->improved dithering</P
-></LI
-><LI
-><P
->improvements in performance</P
-></LI
-></UL
->
- </P
-><P
->The entire Gutenprint team hopes you will really enjoy using this
-software! For more information, please consult the Gutenprint project
-<A
-HREF="http://gimp-print.sourceforge.net"
-TARGET="_top"
->web page</A
->.
- </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->The User's Guide to Gutenprint - Complete Edition</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->GIMP and Gutenprint</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/c443.html b/doc/users_guide/html/c443.html
deleted file mode 100644
index 20227e8..0000000
--- a/doc/users_guide/html/c443.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->CUPS and Gutenprint</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="The Gimp-Print Graphical User Interface"
-HREF="x85.html"><LINK
-REL="NEXT"
-TITLE="CUPS Printer Installation"
-HREF="x452.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x85.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x452.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AEN443"
-></A
->Chapter 3. CUPS and Gutenprint</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="c443.html#AEN445"
->Introduction</A
-></DT
-><DT
-><A
-HREF="x452.html"
->CUPS Printer Installation</A
-></DT
-><DT
-><A
-HREF="x544.html"
->Configuring your Printer in CUPS</A
-></DT
-><DT
-><A
-HREF="x559.html"
->Using CUPS from the Command Line</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN445"
->Introduction</A
-></H1
-><P
-> CUPS is an acronym which stands for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->C</I
-></SPAN
->ommon
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->U</I
-></SPAN
->nix <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->P</I
-></SPAN
->rinting
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->S</I
-></SPAN
->ystem. It is assumed that the reader has
-properly installed the CUPS software and the Gutenprint software.
-This section will discuss adding a printer to CUPS that uses a
-Gutenprint printer driver, as well as how to modify the various
-settings supplied by Gutenprint. This will be a rather quick
-explanation, as the CUPS software is quite well documented, and it is
-not my intention to attempt to duplicate the CUPS documentation here.
- </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x85.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x452.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->The Gimp-Print Graphical User Interface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->CUPS Printer Installation</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/c568.html b/doc/users_guide/html/c568.html
deleted file mode 100644
index 864e0aa..0000000
--- a/doc/users_guide/html/c568.html
+++ /dev/null
@@ -1,754 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Gutenprint Utilities</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="Using CUPS from the Command Line"
-HREF="x559.html"><LINK
-REL="NEXT"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x559.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="gfdl.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AEN568"
-></A
->Chapter 4. Gutenprint Utilities</H1
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN570"
->escputil</A
-></H1
-><P
-> <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> is a command line utility which
-allows the user to perform a variety of maintenance tasks on Epson
-Stylus inkjet printers. These tasks include head alignment, head
-cleaning, nozzle check, printer identification, and retrieval of the ink
-level from the printer. In order for many of the
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> functions to work, the user must have
-read/write access to the raw printer device (typically /dev/lp0,
-/dev/usb/lp0, and the like). In general, these operations should be
-performed by the root user. As always, the user must insure that the
-directory containing the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility is
-listed in the &dollar;PATH environment variable, or that the full path is
-specified on the command line. The examples in this section will
-assume the former.
- </P
-><DIV
-CLASS="CAUTION"
-><P
-></P
-><TABLE
-CLASS="CAUTION"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Caution</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
-> The <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility was designed for use
-ONLY with Epson Stylus inkjet printers supported by the Gutenprint
-software. It is possible that damage MIGHT occur to your printer if
-this utility is misused or if it is used with a printer other than an
-Epson Stylus inkjet printer. It is the sole responsibility of the
-user to insure that this utility is suitable for the task at hand.
- </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
-> In this section, specific examples of common usage will be
-presented. A summary of the command line switches can be
-found in the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
->(1) man page.
- </P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN582"
->Determining Ink Level</A
-></H2
-><P
-> Perhaps the most basic function performed by
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> is that of determining the amount of ink
-remaining in the printer. To do this, the user must know the name of
-the raw printer device. This is usually /dev/lp0 for a printer
-connected to the parallel port, or /dev/usb/lp0 for a printer
-connected to the USB.
- </P
-><P
->If there are multiple printers connected, one of them may be referenced as
-/dev/lp1 or perhaps /dev/usb/lp1. In the event of uncertainty, and if
-CUPS is in use, view the following <A
-HREF="http://localhost:631/printers"
-TARGET="_top"
->URL</A
->
-with a web browser. At that URL, look for a line which reads "Device
-URI". The author's USB printer is listed as "Device URI: usb:/dev/usb/lp0".
- </P
-><P
->For this example, assume that the raw printer device is a USB printer
-specified as /dev/usb/lp0. To get the ink level for this printer,
-issue this command and notice the output.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-# escputil -r /dev/usb/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
- Ink color Percent remaining
- Black 18
- Cyan 71
- Magenta 70
- Yellow 67
- Light Cyan 71
- Light Magenta 70
-
- </PRE
-></TD
-></TR
-></TABLE
-><P
->The user would substitute their own raw printer device for the one
-shown in the example after the "-r" switch. Notice that the printout
-shows the percent of ink remaining for each color of the author's
-Epson Stylus Photo 870. When the ink levels get too low, print
-quality will suffer. In the author's personal experience, ink levels
-approaching 10% begin to cause print quality degredation, but this
-will vary depending on the precise printer model.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN591"
->Error During Ink Level Determination</A
-></H2
-><P
-> What? The example above did not work? An error message was
-printed? What does it mean? There are several possibilities,
-depending on the specific error message. If the error message is
-"Invalid argument" (see following example), the problem is that the
-2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled.
-
- <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-# escputil -r /dev/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Cannot read from /dev/lp0: Invalid argument
-
- </PRE
-></TD
-></TR
-></TABLE
->
-
- Another possibile cause for error is that the raw printer device
-does not have both read and write permission for the user attempting
-to access the device. In this case, the error message will read
-"Permission denied". A final possibility is that the raw printer
-device specified is incorrect, in which case the error message will
-read "No such device".
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN595"
->Nozzle Check</A
-></H2
-><P
-> On an inkjet printer, there are several small holes on the
-bottom of each ink cartridge through which the ink must flow smoothly
-in order to create high quality images on paper. If these holes
-become clogged, the printed image will show small gaps where there
-should have been ink. One can easily test for the existence of this
-condition by running a nozzle check. One need not be the root user to
-issue this command. Note that as shown, the command will print a
-nozzle test pattern on the default printer. If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
- </P
-><P
-> The printer will print a series of black (and colored) slanted
-lines on the paper. Observe these lines carefully. If there are gaps
-or spaces in these lines, then the corresponding nozzle is clogged and
-the print head must be cleaned. However, if there are no gaps, the
-nozzles are clean.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-# escputil -n
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Running nozzle check, please ensure paper is in the printer.
-
- </PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN600"
->Clean the Print Head</A
-></H2
-><P
-> If the printed output is showing gaps where there should have
-been ink, it is likely that one or more nozzles are clogged and the
-print head is in need of cleaning. One can verify this by first
-running a nozzle check and looking for gaps in the printout. To clean
-the print head, issue the following command. One need not be the root user to
-issue this command. Note that as shown, the command will clean the
-print head on the default printer. If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-# escputil -c
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Cleaning heads...
-
- </PRE
-></TD
-></TR
-></TABLE
-><P
-> Nothing will be printed on the paper. The printer will make
-some noise as it cleans the print head. Wait until the printer is
-finished cleaning the print head. Afterwards, execute another nozzle
-check and insure that the print head is indeed completely clean. Note
-that the process of cleaning the print head causes ink consumption, so
-do not clean the print head any more than necessary.
- </P
-><P
->For severely clogged nozzles, one may have to execute two or three cycles
-of nozzle check followed by a cleaning of the print head. If the
-printer had gone unused for a long time, the nozzles may be so clogged
-with dried ink as to be unrecoverable, in which case, the best course
-of action is to replace the ink cartridge.
- </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN606"
->Align the Print Head</A
-></H2
-><P
-> To insure the highest quality printouts, the print head must
-be in proper physical alignment. One can check and realign the print
-head by running this interactive alignment test.
- </P
-><P
->The <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility must know the exact printer model in
-use. One may specify the model on the command line using the "-m"
-switch, or the utility can detect the printer model if the user passes
-the "-r" switch and the name of the raw printer device.
- </P
-><P
->Note that an unprivileged user may use this command with the "-m" switch, but that
-(in general) the root user may only use the "-r" switch (which
-requires read/write access to the raw printer device). In the case of
-multiple printers in use, the "-P" switch is required to align the
-print head on the non-default printer.
- </P
-><DIV
-CLASS="CAUTION"
-><P
-></P
-><TABLE
-CLASS="CAUTION"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Caution</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
->This utility lets you align the print head of your Epson Stylus inkjet
-printer. Misuse of this utility may cause your print quality to degrade
-and possibly damage your printer. This utility has not been reviewed by
-Seiko Epson for correctness, and is offered with no warranty at all. The
-entire risk of using this utility lies with you.
- </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
-> Aligning the print head is an interactive process. The utility
-will print out a set of instructions and ask you for responses. Please
-read the instructions carefully and follow them precisely. A single
-sheet of paper will be needed (one can print on both sides to save paper).
- </P
-><P
->The following example illustrates the alignment process when issued by an
-unprivileged user who specified the printer model on the command
-line. (To obtain a list of printer models, issue the "escputil -M"
-command). Of course, your responses will vary and should be
-substituted for the responses shown in the following example.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-
-*** NOTE - 870 is an illustrative example! ***
-*** You MUST use the proper printer model! ***
-*** Run: escputil -M for a listing of ***
-*** supported printer models! ***
-
-linuxpc&#62; escputil -a -m 870
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Please read these instructions very carefully before proceeding.
-
-This utility lets you align the print head of your Epson Stylus
-inkjet printer. Misuse of this utility may cause your print
-quality to degrade and possibly damage your printer. This utility
-has not been reviewed by Seiko Epson for correctness, and is
-offered with no warranty at all. The entire risk of using this
-utility lies with you.
-
-This utility prints 3 test patterns. Each pattern looks very
-similar. The patterns consist of a series of pairs of vertical
-lines that overlap. Below each pair of lines is a number between
-1 and 15.
-
-When you inspect the pairs of lines, you should find the pair
-of lines that is best in alignment, that is, that best forms
-a single vertical line. Inspect the pairs very carefully to
-find the best match. Using a loupe or magnifying glass is
-recommended for the most critical inspection. It is also
-suggested that you use a good quality paper for the test, so
-that the lines are well-formed and do not spread through the
-paper. After picking the number matching the best pair, place
-the paper back in the paper input tray before typing it in.
-
-Each pattern is similar, but later patterns use finer dots for
-more critical alignment. You must run all of the passes to
-correctly align your printer. After running all the alignment
-passes, the alignment patterns will be printed once more. You
-should find that the middle-most pair (#8 out of the 15) is the
-best for all patterns.
-
-After the passes are printed once more, you will be offered the
-choices of (s)aving the result in the printer, (r)epeating the
-process, or (q)uitting without saving. Quitting will not restore
-the previous settings, but powering the printer off and back
-on will. If you quit, you must repeat the entire process if
-you wish to later save the results. It is essential that you
-not turn your printer off during this procedure.
-
-This procedure assumes that your printer is an Epson Stylus Photo
-870. If this is not your printer model, please type control-C now
-and choose your actual printer model.
-
-Please place a sheet of paper in your printer to begin the head
-alignment procedure.
-Press enter to continue &#62;
-Please inspect the print, and choose the best pair of lines in
-each pattern. Type a pair number, '?' for help, or 'r' to repeat
-the procedure.
-Pass #1&#62; 8
-Pass #2&#62; 8
-Pass #3&#62; 8
-Attempting to set alignment...succeeded.
-Please verify that the alignment is correct. After the alignment
-pattern is printed again, please ensure that the best pattern
-for each line is pattern 8. If it is not, you should repeat the
-process to get the best quality printing.
-Please insert a fresh sheet of paper.
-Press enter to continue &#62;
-Please inspect the final output very carefully to ensure that your
-printer is in proper alignment. You may now:
- (s)ave the results in the printer,
- (q)uit without saving the results, or
- (r)epeat the entire process from the beginning.
-You will then be asked to confirm your choice.
-What do you want to do (s, q, r)?
-&#62; s
-This will permanently alter the configuration of your printer.
-WARNING: this procedure has not been approved by Seiko Epson,
-and it may damage your printer. Proceed?
-Please confirm by typing 's' again that you wish to save the
-settings to your printer:
-&#62; s
-About to save settings...succeeded!
-Your alignment settings have been saved to the printer.
-
- </PRE
-></TD
-></TR
-></TABLE
-><P
-> The following example shows what will happen if an unprivileged
-user attempts to align the print head by specifying the raw printer
-device on the command line.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-linuxpc&#62; escputil -a -r /dev/usb/lp0
-Escputil version 4.2.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...
-Cannot open /dev/usb/lp0 read/write: Permission denied
-
- </PRE
-></TD
-></TR
-></TABLE
-><P
-> This next example illustrates the results obtained when the root
-user issues an alignment command while specifying the raw printer
-device. Note that the output is truncated and only shows the printer
-detection output.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-# escputil -a -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...Stylus Photo 870
-
-Please read these instructions very carefully before proceeding.
-
- </PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN622"
->Printer Identification</A
-></H2
-><P
-> The printer identification command will query the printer for
-make and model information. This command requires read/write access
-to the raw printer device (generally limited to the root user).
-Substitute your own raw printer device in place of the /dev/usb/lp0
-shown in the example. The output will vary depending on the precise
-printer model.
- </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
-# escputil -d -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-@EJL ID
-MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
-EPSON Stylus Photo 870;
-
- </PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN626"
->More Information</A
-></H2
-><P
-> For more detailed information about the command line switches
-accepted by the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility, please consult
-the man page which is supplied with the Gutenprint software. The user
-may also issue the "escputil --help" command to get a listing of supported
-command line switches. The command requires no special privileges to execute.
- </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x559.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Using CUPS from the Command Line</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->GNU Free Documentation License</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/ch-gimp-and-gimp-print.html b/doc/users_guide/html/ch-gimp-and-gimp-print.html
deleted file mode 100644
index 174f782..0000000
--- a/doc/users_guide/html/ch-gimp-and-gimp-print.html
+++ /dev/null
@@ -1,245 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->GIMP and Gutenprint</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="Project History"
-HREF="c29.html"><LINK
-REL="NEXT"
-TITLE="The Gimp-Print Graphical User Interface"
-HREF="x85.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="c29.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x85.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="CH-GIMP-AND-GIMP-PRINT"
-></A
->Chapter 2. GIMP and Gutenprint</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="ch-gimp-and-gimp-print.html#AEN63"
->Running the GIMP</A
-></DT
-><DT
-><A
-HREF="x85.html"
->The Gimp-Print Graphical User Interface</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN63"
->Running the GIMP</A
-></H1
-><P
-> This section assumes that you have the GIMP version 1.2 installed
-and working properly on your computer, and that you have an image of
-some type that you desire to print. To get started quickly, log into
-your system, start the X window system, and bring up your favorite terminal
-window. At the $ prompt, type:
-
- <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
- $ gimp &#38;
-
- </PRE
-></TD
-></TR
-></TABLE
->
-
- This should start the GIMP for you. If it does not, check that
-you have installed the GIMP properly, and that its binary is located
-in one of the directories listed in your &dollar;PATH environment
-variable. On the assumption that this worked, the screen should now
-look something like this:
-
- <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN67"
-></A
-><P
-><B
->Figure 2-1. The Startup Window for The GIMP</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp_startup.png"></P
-></DIV
-></DIV
->
-
- </P
-><P
-> At this point, you should use the
-
- <SPAN
-CLASS="GUIMENU"
->File</SPAN
->-&gt;<SPAN
-CLASS="GUIMENUITEM"
->Open</SPAN
->
-
-menu option to open your favorite picture. We will print this picture
-shortly. Your picture should be displayed next to the GIMP startup
-window, perhaps looking similar to the following (sssh! Don't tell
-anybody the secret!):
-
- <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN78"
-></A
-><P
-><B
->Figure 2-2. A Sample Image Displayed by The GIMP</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp_image.png"></P
-></DIV
-></DIV
->
-
- </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="c29.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x85.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Project History</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->The Gimp-Print Graphical User Interface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/docbook.css b/doc/users_guide/html/docbook.css
deleted file mode 100644
index 0f90516..0000000
--- a/doc/users_guide/html/docbook.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.NAVHEADER { display: none }
-.NAVFOOTER { display: none }
-.TOC { display: none }
-
-.NAVTOC { margin-left: 15;
- display: none }
-
-.NAVBTN { font-size: 10pt }
-
-.TOCTITLE { font-size: 10pt;
- color: blue;
- text-decoration: underline; }
diff --git a/doc/users_guide/html/gfdl.html b/doc/users_guide/html/gfdl.html
deleted file mode 100644
index 78d79fd..0000000
--- a/doc/users_guide/html/gfdl.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->GNU Free Documentation License</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="Gutenprint Utilities"
-HREF="c568.html"><LINK
-REL="NEXT"
-TITLE="APPLICABILITY AND DEFINITIONS"
-HREF="x640.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="APPENDIX"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="c568.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x640.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="APPENDIX"
-><H1
-><A
-NAME="GFDL"
-></A
->Appendix A. GNU Free Documentation License</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->0. <A
-HREF="gfdl.html#AEN635"
->PREAMBLE</A
-></DT
-><DT
->1. <A
-HREF="x640.html"
->APPLICABILITY AND DEFINITIONS</A
-></DT
-><DT
->2. <A
-HREF="x650.html"
->VERBATIM COPYING</A
-></DT
-><DT
->3. <A
-HREF="x654.html"
->COPYING IN QUANTITY</A
-></DT
-><DT
->4. <A
-HREF="x660.html"
->MODIFICATIONS</A
-></DT
-><DT
->5. <A
-HREF="x696.html"
->COMBINING DOCUMENTS</A
-></DT
-><DT
->6. <A
-HREF="x701.html"
->COLLECTIONS OF DOCUMENTS</A
-></DT
-><DT
->7. <A
-HREF="x705.html"
->AGGREGATION WITH INDEPENDENT WORKS</A
-></DT
-><DT
->8. <A
-HREF="x709.html"
->TRANSLATION</A
-></DT
-><DT
->9. <A
-HREF="x712.html"
->TERMINATION</A
-></DT
-><DT
->10. <A
-HREF="x715.html"
->FUTURE REVISIONS OF THIS LICENSE</A
-></DT
-><DT
-><A
-HREF="x720.html"
->How to use this License for your documents</A
-></DT
-></DL
-></DIV
-><P
->Version 1.1, March 2000</P
-><A
-NAME="AEN633"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
->Copyright (C) 2000 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.</P
-></BLOCKQUOTE
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN635"
->0. PREAMBLE</A
-></H1
-><P
->The purpose of this License is to make a manual, textbook,
- or other written document "free" in the sense of freedom: to
- assure everyone the effective freedom to copy and redistribute it,
- with or without modifying it, either commercially or
- noncommercially. Secondarily, this License preserves for the
- author and publisher a way to get credit for their work, while not
- being considered responsible for modifications made by
- others.</P
-><P
->This License is a kind of "copyleft", which means that
- derivative works of the document must themselves be free in the
- same sense. It complements the GNU General Public License, which
- is a copyleft license designed for free software.</P
-><P
->We have designed this License in order to use it for manuals
- for free software, because free software needs free documentation:
- a free program should come with manuals providing the same
- freedoms that the software does. But this License is not limited
- to software manuals; it can be used for any textual work,
- regardless of subject matter or whether it is published as a
- printed book. We recommend this License principally for works
- whose purpose is instruction or reference.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="c568.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x640.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Gutenprint Utilities</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->APPLICABILITY AND DEFINITIONS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/ln12.html b/doc/users_guide/html/ln12.html
deleted file mode 100644
index ae1606e..0000000
--- a/doc/users_guide/html/ln12.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="NEXT"
-TITLE="Project History"
-HREF="c29.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="LEGALNOTICE"
-><P
-></P
-><A
-NAME="AEN12"
-></A
-><P
->The User's Guide to Gutenprint - Complete Edition,
-Copyright 2002, Andy Stewart.
- </P
-><P
-> Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.1 or any later version published by the Free Software
-Foundation with no invariant sections, no Front-Cover texts, and no
-Back-Cover texts. A copy of the license is included in <A
-HREF="gfdl.html"
->Appendix A</A
->.
- </P
-><P
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/stylesheet-images/caution.gif b/doc/users_guide/html/stylesheet-images/caution.gif
deleted file mode 100644
index 9cc2e15..0000000
--- a/doc/users_guide/html/stylesheet-images/caution.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/home.gif b/doc/users_guide/html/stylesheet-images/home.gif
deleted file mode 100644
index 55e1d59..0000000
--- a/doc/users_guide/html/stylesheet-images/home.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/important.gif b/doc/users_guide/html/stylesheet-images/important.gif
deleted file mode 100644
index 25e40c7..0000000
--- a/doc/users_guide/html/stylesheet-images/important.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/next.gif b/doc/users_guide/html/stylesheet-images/next.gif
deleted file mode 100644
index 8c502e7..0000000
--- a/doc/users_guide/html/stylesheet-images/next.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/note.gif b/doc/users_guide/html/stylesheet-images/note.gif
deleted file mode 100644
index 7322e8e..0000000
--- a/doc/users_guide/html/stylesheet-images/note.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/prev.gif b/doc/users_guide/html/stylesheet-images/prev.gif
deleted file mode 100644
index 0894d9e..0000000
--- a/doc/users_guide/html/stylesheet-images/prev.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/tip.gif b/doc/users_guide/html/stylesheet-images/tip.gif
deleted file mode 100644
index f062955..0000000
--- a/doc/users_guide/html/stylesheet-images/tip.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/toc-blank.gif b/doc/users_guide/html/stylesheet-images/toc-blank.gif
deleted file mode 100644
index 6c65e3a..0000000
--- a/doc/users_guide/html/stylesheet-images/toc-blank.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/toc-minus.gif b/doc/users_guide/html/stylesheet-images/toc-minus.gif
deleted file mode 100644
index 40ebe61..0000000
--- a/doc/users_guide/html/stylesheet-images/toc-minus.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/toc-plus.gif b/doc/users_guide/html/stylesheet-images/toc-plus.gif
deleted file mode 100644
index 3e9e7d5..0000000
--- a/doc/users_guide/html/stylesheet-images/toc-plus.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/up.gif b/doc/users_guide/html/stylesheet-images/up.gif
deleted file mode 100644
index e899a27..0000000
--- a/doc/users_guide/html/stylesheet-images/up.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/stylesheet-images/warning.gif b/doc/users_guide/html/stylesheet-images/warning.gif
deleted file mode 100644
index a587079..0000000
--- a/doc/users_guide/html/stylesheet-images/warning.gif
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/html/x452.html b/doc/users_guide/html/x452.html
deleted file mode 100644
index 773549f..0000000
--- a/doc/users_guide/html/x452.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->CUPS Printer Installation</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="PREVIOUS"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="NEXT"
-TITLE="Configuring your Printer in CUPS"
-HREF="x544.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="c443.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. CUPS and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x544.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN452"
->CUPS Printer Installation</A
-></H1
-><P
->This explanation will use the web interface provided by CUPS. First,
-aim your favorite web browser at
-<A
-HREF="http://localhost:631"
-TARGET="_top"
->the CUPS server</A
->. The
-following screen should appear within your browser.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN456"
-></A
-><P
-><B
->Figure 3-1. The CUPS Startup Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_startup.png"></P
-></DIV
-></DIV
-><P
->Now, you may click on either the word <SPAN
-CLASS="GUILABEL"
->Printers</SPAN
-> in the bar at the top
-of the page, or you may click on the <SPAN
-CLASS="GUILABEL"
->Manage Printers</SPAN
-> text. In
-either case, the next screen you see will look like this one if you
-have not yet configured any printers.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN466"
-></A
-><P
-><B
->Figure 3-2. The CUPS Printers Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_printers.png"></P
-></DIV
-></DIV
-><P
->At this time, click on the <SPAN
-CLASS="GUIBUTTON"
->Add Printer</SPAN
-> button.
-You will then see the Admin screen (shown below).
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN475"
-></A
-><P
-><B
->Figure 3-3. The CUPS Admin Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin.png"></P
-></DIV
-></DIV
-><P
->Notice in the screenshot that the three boxes are shown after the
-author filled them in for his printer at home. You will need to fill
-in an appropriate name of your printer, its location, and a
-description which meets your own needs. Once this is done, click on
-the <SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button, and then this screen will appear.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-ADMIN-DEVICE"
-></A
-><P
-><B
->Figure 3-4. The CUPS Admin Device Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_device.png"></P
-></DIV
-></DIV
-><P
->Click on the drop down menu next to the word
-<SPAN
-CLASS="GUILABEL"
->Device</SPAN
-> and a list of possible printer devices
-appears. Select the device appropriate for your printer. Note that
-there are a range of serial, parallel, USB, and other devices from
-which to choose. Once the selection is made, click the
-<SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button. Now, this screen appears.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN494"
-></A
-><P
-><B
->Figure 3-5. The CUPS Admin Model/Driver Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_make.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="CAUTION"
-><P
-></P
-><TABLE
-CLASS="CAUTION"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Caution Regarding USB Printers</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
->CUPS versions 1.1.11 and later <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->REQUIRE</I
-></SPAN
->
-the user to insure that the desired USB printer is powered on
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->AND</I
-></SPAN
-> physically connected to the USB bus
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->BEFORE</I
-></SPAN
-> starting the CUPS software.
- </P
-><P
->CUPS must see the USB printer when the software starts. The CUPS software
-is typically started when the computer boots. Note that one cannot
-simply plug in the USB printer and power it on after CUPS has started.
-(Note that this does not apply to parallel port printers).
- </P
-><P
->If the USB printer was not connected and powered on at the time CUPS was
-started, there will not be a USB printer shown in the
-list of devices on the CUPS Admin Device Window (see
-<A
-HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
->Figure 3-4</A
->). In this event, stop the CUPS
-software, properly connect and power on the USB printer, and restart
-the CUPS software.
- </P
-><P
->From the list of devices shown in the CUPS Admin Device Window
-(see <A
-HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
->Figure 3-4</A
->), a clever user might
-attempt to avoid this issue by selecting
-<SPAN
-CLASS="GUIMENUITEM"
->Internet Printing Protocol</SPAN
->
-and then enter something similar to 'usb:/dev/usblp0' in the next
-screen. However, this fails later in the configuration process with a
-"client_error_not_possible" error message with no other explanation.
-Note that entering 'file:/dev/usblp0' will not work either. While CUPS
-will allow this, printing will not actually work in some situations.
- </P
-><P
->CUPS versions 1.1.10 and earlier exhibit similar behavior with regard
-to not displaying the USB printer if it was not connected to the USB
-bus and powered up prior to starting the CUPS software. However,
-these versions of CUPS will indeed allow the user to enter the name of
-the USB connection, unlike versions 1.1.11 and later.
- </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
->Select the manufacturer of your printer and click the
-<SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button. A window will appear which
-asks you to select the specific model number for your printer.
- </P
-><P
->Scroll through the long list and find the model number for your
-printer. Notice carefully that there are many different languages
-supported for each printer, as denoted by the initials in parenthesis.
-(en) would be for English, (da) for Danish, (sv) for Swedish, (fr) for
-French, (no) for Norwegian, (pl) for Polish, and (en_GB) for British
-English (see <A
-HREF="x452.html#FIG-CUPS-ADMIN-MODEL"
->Figure 3-6</A
->). Also take note
-of the Gutenprint revision for the driver, and ensure that it is
-indeed the version of Gutenprint which you have most recently
-installed. Once you have made the proper selection, click on the
-<SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-ADMIN-MODEL"
-></A
-><P
-><B
->Figure 3-6. The 2nd CUPS Admin Model/Driver Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_model.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN526"
-></A
-><P
-><B
->Figure 3-7. The CUPS Admin Success Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_success.png"></P
-></DIV
-></DIV
-><P
->Congratulations! You should now see the CUPS window indicating that
-your printer was successfully installed. Notice the sentence which
-reads "Printer your_printer has been added successfully". Click on
-your_printer, which will be the underlined name for your printer.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-MY-PRINTER"
-></A
-><P
-><B
->Figure 3-8. The CUPS Window for Your Printer</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_my_printer.png"></P
-></DIV
-></DIV
-><P
->After clicking on your_printer (epson_870 in this example), a window
-will appear similar to that shown in <A
-HREF="x452.html#FIG-CUPS-MY-PRINTER"
->Figure 3-8</A
->.
-It would probably be a good idea at this point to click on the
-<SPAN
-CLASS="GUIBUTTON"
->Print Test Page</SPAN
-> button to ensure that
-everything is working properly. Take note of the Gutenprint revision
-printed on this screen and confirm once again that it is the expected
-revision.
- </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x544.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->CUPS and Gutenprint</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Configuring your Printer in CUPS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x544.html b/doc/users_guide/html/x544.html
deleted file mode 100644
index d87c348..0000000
--- a/doc/users_guide/html/x544.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Configuring your Printer in CUPS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="PREVIOUS"
-TITLE="CUPS Printer Installation"
-HREF="x452.html"><LINK
-REL="NEXT"
-TITLE="Using CUPS from the Command Line"
-HREF="x559.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x452.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. CUPS and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x559.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN544"
->Configuring your Printer in CUPS</A
-></H1
-><P
->With reference to <A
-HREF="x452.html#FIG-CUPS-MY-PRINTER"
->Figure 3-8</A
->, click
-on the <SPAN
-CLASS="GUIBUTTON"
->Configure Printer</SPAN
-> button. A partial
-screenshot of the printer configuration window appears in
-<A
-HREF="x544.html#FIG-CUPS-PRINTER-CONFIG-WINDOW"
->Figure 3-9</A
->.
-The contents of this window will vary depending on precisely which
-printer you selected when you configured CUPS for your printer. The
-screenshot shows the selections made by the author for his printer.
-The individual selections will not be explained in detail here, as
-they are the same selections which are available when using the
-Gutenprint plugin to the GIMP. These selections are explained in
-detail in various sections of the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->GIMP and
-Gutenprint</I
-></SPAN
-> chapter of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->The User's Guide to the
-Gutenprint Top Quality Printer Drivers</I
-></SPAN
->.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-PRINTER-CONFIG-WINDOW"
-></A
-><P
-><B
->Figure 3-9. The CUPS Printer Cofiguration Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_config_printer.png"></P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x452.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x559.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->CUPS Printer Installation</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Using CUPS from the Command Line</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x559.html b/doc/users_guide/html/x559.html
deleted file mode 100644
index c0161f1..0000000
--- a/doc/users_guide/html/x559.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Using CUPS from the Command Line</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="PREVIOUS"
-TITLE="Configuring your Printer in CUPS"
-HREF="x544.html"><LINK
-REL="NEXT"
-TITLE="Gutenprint Utilities"
-HREF="c568.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x544.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. CUPS and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="c568.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN559"
->Using CUPS from the Command Line</A
-></H1
-><P
-> It is possible to use the CUPS printing system from the command
-line. While this document will not delve into all of the specifics of
-the CUPS command line interface, there are portions of this interface
-which are specific to the Gutenprint software.
- </P
-><P
->The command line is in some cases a more convenient way to generate
-printed output (e.g. when printing from a script). However, most
-people (including the author) cannot easily predict what a command
-line option of "-o stpCyan=1350" will do to the output. It is
-therefore a good idea to use the GIMP to view the image and the
-Gutenprint plugin to preview these settings before relying on the
-command line.
- </P
-><P
->When using CUPS from the command line, the command will have this
-general format:
-
- <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
- lpr -P my_printer_name \
- -o option1=&#60;choice1&#62; \
- -o option2=&#60;choice2&#62; \
- /path/to/printfile
-
- </PRE
-></TD
-></TR
-></TABLE
->
-
-When typing the command directly onto the command line, put all of the
-command line options on one line, and do not type the "\" characters.
-The list of possible options which are specific to Gutenprint,
-followed by some of the supported choices, are shown below:
-
- <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->
- -o PageSize=&#60;...| A3 | A4 | A4 | ...&#62;
- -o InputSlot=&#60;Roll | Standard&#62;
- -o MediaType=&#60; ..| Inkjet | Plain | GlossyPaper | ...&#62;
- -o Resolution=&#60;360sw | 360swuni ...| 1440x720 &#62;
- -o ColorModel=&#60;Black | RGB | Gray | CMYK&#62;
- -o stpBrightness=&#60;0...2000&#62;
- -o stpContrast=&#60;0...2000&#62;
- -o stpCyan=&#60;0...4000&#62;
- -o stpDensity=&#60;0...2000&#62;
- -o stpDither=&#60;0...4000&#62;
- -o stpGamma=&#60;0...4000&#62;
- -o stpImageType=&#60;LineArt | Continuous | SolidTone&#62;
- -o stpInkType=&#60;PhotoCMY | CMYK | PhotoCMYK | RGB&#62;
- -o stpMagenta=&#60;0...4000&#62;
- -o stpSaturation=&#60;0...9000&#62;
- -o stpYellow=&#60;0...4000&#62;
-
- </PRE
-></TD
-></TR
-></TABLE
->
-
-For more detailed information, consult the appropriate sections of the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->GIMP and
-Gutenprint</I
-></SPAN
-> chapter of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->The User's Guide to the
-Gutenprint Top Quality Printer Drivers</I
-></SPAN
->.
- </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x544.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="c568.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Configuring your Printer in CUPS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Gutenprint Utilities</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x640.html b/doc/users_guide/html/x640.html
deleted file mode 100644
index d7b2844..0000000
--- a/doc/users_guide/html/x640.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->APPLICABILITY AND DEFINITIONS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="NEXT"
-TITLE="VERBATIM COPYING"
-HREF="x650.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="gfdl.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x650.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN640"
->1. APPLICABILITY AND DEFINITIONS</A
-></H1
-><P
->This License applies to any manual or other work that
- contains a notice placed by the copyright holder saying it can be
- distributed under the terms of this License. The "Document",
- below, refers to any such manual or work. Any member of the
- public is a licensee, and is addressed as "you".</P
-><P
->A "Modified Version" of the Document means any work
- containing the Document or a portion of it, either copied
- verbatim, or with modifications and/or translated into another
- language.</P
-><P
->A "Secondary Section" is a named appendix or a front-matter
- section of the Document that deals exclusively with the
- relationship of the publishers or authors of the Document to the
- Document's overall subject (or to related matters) and contains
- nothing that could fall directly within that overall subject.
- (For example, if the Document is in part a textbook of
- mathematics, a Secondary Section may not explain any mathematics.)
- The relationship could be a matter of historical connection with
- the subject or with related matters, or of legal, commercial,
- philosophical, ethical or political position regarding
- them.</P
-><P
->The "Invariant Sections" are certain Secondary Sections
- whose titles are designated, as being those of Invariant Sections,
- in the notice that says that the Document is released under this
- License.</P
-><P
->The "Cover Texts" are certain short passages of text that
- are listed, as Front-Cover Texts or Back-Cover Texts, in the
- notice that says that the Document is released under this
- License.</P
-><P
->A "Transparent" copy of the Document means a
- machine-readable copy, represented in a format whose specification
- is available to the general public, whose contents can be viewed
- and edited directly and straightforwardly with generic text
- editors or (for images composed of pixels) generic paint programs
- or (for drawings) some widely available drawing editor, and that
- is suitable for input to text formatters or for automatic
- translation to a variety of formats suitable for input to text
- formatters. A copy made in an otherwise Transparent file format
- whose markup has been designed to thwart or discourage subsequent
- modification by readers is not Transparent. A copy that is not
- "Transparent" is called "Opaque".</P
-><P
->Examples of suitable formats for Transparent copies include
- plain ASCII without markup, Texinfo input format, LaTeX input
- format, SGML or XML using a publicly available DTD, and
- standard-conforming simple HTML designed for human modification.
- Opaque formats include PostScript, PDF, proprietary formats that
- can be read and edited only by proprietary word processors, SGML
- or XML for which the DTD and/or processing tools are not generally
- available, and the machine-generated HTML produced by some word
- processors for output purposes only.</P
-><P
->The "Title Page" means, for a printed book, the title page
- itself, plus such following pages as are needed to hold, legibly,
- the material this License requires to appear in the title page.
- For works in formats which do not have any title page as such,
- "Title Page" means the text near the most prominent appearance of
- the work's title, preceding the beginning of the body of the
- text.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x650.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->GNU Free Documentation License</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->VERBATIM COPYING</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x650.html b/doc/users_guide/html/x650.html
deleted file mode 100644
index 404839f..0000000
--- a/doc/users_guide/html/x650.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->VERBATIM COPYING</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="APPLICABILITY AND DEFINITIONS"
-HREF="x640.html"><LINK
-REL="NEXT"
-TITLE="COPYING IN QUANTITY"
-HREF="x654.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x640.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x654.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN650"
->2. VERBATIM COPYING</A
-></H1
-><P
->You may copy and distribute the Document in any medium,
- either commercially or noncommercially, provided that this
- License, the copyright notices, and the license notice saying this
- License applies to the Document are reproduced in all copies, and
- that you add no other conditions whatsoever to those of this
- License. You may not use technical measures to obstruct or
- control the reading or further copying of the copies you make or
- distribute. However, you may accept compensation in exchange for
- copies. If you distribute a large enough number of copies you
- must also follow the conditions in section 3.</P
-><P
->You may also lend copies, under the same conditions stated
- above, and you may publicly display copies.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x640.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x654.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->APPLICABILITY AND DEFINITIONS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->COPYING IN QUANTITY</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x654.html b/doc/users_guide/html/x654.html
deleted file mode 100644
index 07a86e9..0000000
--- a/doc/users_guide/html/x654.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->COPYING IN QUANTITY</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="VERBATIM COPYING"
-HREF="x650.html"><LINK
-REL="NEXT"
-TITLE="MODIFICATIONS"
-HREF="x660.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x650.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x660.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN654"
->3. COPYING IN QUANTITY</A
-></H1
-><P
->If you publish printed copies of the Document numbering more
- than 100, and the Document's license notice requires Cover Texts,
- you must enclose the copies in covers that carry, clearly and
- legibly, all these Cover Texts: Front-Cover Texts on the front
- cover, and Back-Cover Texts on the back cover. Both covers must
- also clearly and legibly identify you as the publisher of these
- copies. The front cover must present the full title with all
- words of the title equally prominent and visible. You may add
- other material on the covers in addition. Copying with changes
- limited to the covers, as long as they preserve the title of the
- Document and satisfy these conditions, can be treated as verbatim
- copying in other respects.</P
-><P
->If the required texts for either cover are too voluminous to
- fit legibly, you should put the first ones listed (as many as fit
- reasonably) on the actual cover, and continue the rest onto
- adjacent pages.</P
-><P
->If you publish or distribute Opaque copies of the Document
- numbering more than 100, you must either include a
- machine-readable Transparent copy along with each Opaque copy, or
- state in or with each Opaque copy a publicly-accessible
- computer-network location containing a complete Transparent copy
- of the Document, free of added material, which the general
- network-using public has access to download anonymously at no
- charge using public-standard network protocols. If you use the
- latter option, you must take reasonably prudent steps, when you
- begin distribution of Opaque copies in quantity, to ensure that
- this Transparent copy will remain thus accessible at the stated
- location until at least one year after the last time you
- distribute an Opaque copy (directly or through your agents or
- retailers) of that edition to the public.</P
-><P
->It is requested, but not required, that you contact the
- authors of the Document well before redistributing any large
- number of copies, to give them a chance to provide you with an
- updated version of the Document.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x650.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x660.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->VERBATIM COPYING</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->MODIFICATIONS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x660.html b/doc/users_guide/html/x660.html
deleted file mode 100644
index edf6731..0000000
--- a/doc/users_guide/html/x660.html
+++ /dev/null
@@ -1,285 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->MODIFICATIONS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="COPYING IN QUANTITY"
-HREF="x654.html"><LINK
-REL="NEXT"
-TITLE="COMBINING DOCUMENTS"
-HREF="x696.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x654.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x696.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN660"
->4. MODIFICATIONS</A
-></H1
-><P
->You may copy and distribute a Modified Version of the
- Document under the conditions of sections 2 and 3 above, provided
- that you release the Modified Version under precisely this
- License, with the Modified Version filling the role of the
- Document, thus licensing distribution and modification of the
- Modified Version to whoever possesses a copy of it. In addition,
- you must do these things in the Modified Version:</P
-><P
-></P
-><OL
-TYPE="A"
-><LI
-><P
->Use in the Title Page
- (and on the covers, if any) a title distinct from that of the
- Document, and from those of previous versions (which should, if
- there were any, be listed in the History section of the
- Document). You may use the same title as a previous version if
- the original publisher of that version gives permission.</P
-></LI
-><LI
-><P
->List on the Title Page,
- as authors, one or more persons or entities responsible for
- authorship of the modifications in the Modified Version,
- together with at least five of the principal authors of the
- Document (all of its principal authors, if it has less than
- five).</P
-></LI
-><LI
-><P
->State on the Title page
- the name of the publisher of the Modified Version, as the
- publisher.</P
-></LI
-><LI
-><P
->Preserve all the
- copyright notices of the Document.</P
-></LI
-><LI
-><P
->Add an appropriate
- copyright notice for your modifications adjacent to the other
- copyright notices.</P
-></LI
-><LI
-><P
->Include, immediately
- after the copyright notices, a license notice giving the public
- permission to use the Modified Version under the terms of this
- License, in the form shown in the Addendum below.</P
-></LI
-><LI
-><P
->Preserve in that license
- notice the full lists of Invariant Sections and required Cover
- Texts given in the Document's license notice.</P
-></LI
-><LI
-><P
->Include an unaltered
- copy of this License.</P
-></LI
-><LI
-><P
->Preserve the section
- entitled "History", and its title, and add to it an item stating
- at least the title, year, new authors, and publisher of the
- Modified Version as given on the Title Page. If there is no
- section entitled "History" in the Document, create one stating
- the title, year, authors, and publisher of the Document as given
- on its Title Page, then add an item describing the Modified
- Version as stated in the previous sentence.</P
-></LI
-><LI
-><P
->Preserve the network
- location, if any, given in the Document for public access to a
- Transparent copy of the Document, and likewise the network
- locations given in the Document for previous versions it was
- based on. These may be placed in the "History" section. You
- may omit a network location for a work that was published at
- least four years before the Document itself, or if the original
- publisher of the version it refers to gives permission.</P
-></LI
-><LI
-><P
->In any section entitled
- "Acknowledgements" or "Dedications", preserve the section's
- title, and preserve in the section all the substance and tone of
- each of the contributor acknowledgements and/or dedications
- given therein.</P
-></LI
-><LI
-><P
->Preserve all the
- Invariant Sections of the Document, unaltered in their text and
- in their titles. Section numbers or the equivalent are not
- considered part of the section titles.</P
-></LI
-><LI
-><P
->Delete any section
- entitled "Endorsements". Such a section may not be included in
- the Modified Version.</P
-></LI
-><LI
-><P
->Do not retitle any
- existing section as "Endorsements" or to conflict in title with
- any Invariant Section.</P
-></LI
-></OL
-><P
->If the Modified Version includes new front-matter sections
- or appendices that qualify as Secondary Sections and contain no
- material copied from the Document, you may at your option
- designate some or all of these sections as invariant. To do this,
- add their titles to the list of Invariant Sections in the Modified
- Version's license notice. These titles must be distinct from any
- other section titles.</P
-><P
->You may add a section entitled "Endorsements", provided it
- contains nothing but endorsements of your Modified Version by
- various parties--for example, statements of peer review or that
- the text has been approved by an organization as the authoritative
- definition of a standard.</P
-><P
->You may add a passage of up to five words as a Front-Cover
- Text, and a passage of up to 25 words as a Back-Cover Text, to the
- end of the list of Cover Texts in the Modified Version. Only one
- passage of Front-Cover Text and one of Back-Cover Text may be
- added by (or through arrangements made by) any one entity. If the
- Document already includes a cover text for the same cover,
- previously added by you or by arrangement made by the same entity
- you are acting on behalf of, you may not add another; but you may
- replace the old one, on explicit permission from the previous
- publisher that added the old one.</P
-><P
->The author(s) and publisher(s) of the Document do not by
- this License give permission to use their names for publicity for
- or to assert or imply endorsement of any Modified Version.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x654.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x696.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->COPYING IN QUANTITY</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->COMBINING DOCUMENTS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x696.html b/doc/users_guide/html/x696.html
deleted file mode 100644
index 646e3d9..0000000
--- a/doc/users_guide/html/x696.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->COMBINING DOCUMENTS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="MODIFICATIONS"
-HREF="x660.html"><LINK
-REL="NEXT"
-TITLE="COLLECTIONS OF DOCUMENTS"
-HREF="x701.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x660.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x701.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN696"
->5. COMBINING DOCUMENTS</A
-></H1
-><P
->You may combine the Document with other documents released
- under this License, under the terms defined in section 4 above for
- modified versions, provided that you include in the combination
- all of the Invariant Sections of all of the original documents,
- unmodified, and list them all as Invariant Sections of your
- combined work in its license notice.</P
-><P
->The combined work need only contain one copy of this
- License, and multiple identical Invariant Sections may be replaced
- with a single copy. If there are multiple Invariant Sections with
- the same name but different contents, make the title of each such
- section unique by adding at the end of it, in parentheses, the
- name of the original author or publisher of that section if known,
- or else a unique number. Make the same adjustment to the section
- titles in the list of Invariant Sections in the license notice of
- the combined work.</P
-><P
->In the combination, you must combine any sections entitled
- "History" in the various original documents, forming one section
- entitled "History"; likewise combine any sections entitled
- "Acknowledgements", and any sections entitled "Dedications". You
- must delete all sections entitled "Endorsements."</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x660.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x701.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->MODIFICATIONS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->COLLECTIONS OF DOCUMENTS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x701.html b/doc/users_guide/html/x701.html
deleted file mode 100644
index 4995032..0000000
--- a/doc/users_guide/html/x701.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->COLLECTIONS OF DOCUMENTS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="COMBINING DOCUMENTS"
-HREF="x696.html"><LINK
-REL="NEXT"
-TITLE="AGGREGATION WITH INDEPENDENT WORKS"
-HREF="x705.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x696.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x705.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN701"
->6. COLLECTIONS OF DOCUMENTS</A
-></H1
-><P
->You may make a collection consisting of the Document and
- other documents released under this License, and replace the
- individual copies of this License in the various documents with a
- single copy that is included in the collection, provided that you
- follow the rules of this License for verbatim copying of each of
- the documents in all other respects.</P
-><P
->You may extract a single document from such a collection,
- and distribute it individually under this License, provided you
- insert a copy of this License into the extracted document, and
- follow this License in all other respects regarding verbatim
- copying of that document.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x696.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x705.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->COMBINING DOCUMENTS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->AGGREGATION WITH INDEPENDENT WORKS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x705.html b/doc/users_guide/html/x705.html
deleted file mode 100644
index e2528af..0000000
--- a/doc/users_guide/html/x705.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->AGGREGATION WITH INDEPENDENT WORKS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="COLLECTIONS OF DOCUMENTS"
-HREF="x701.html"><LINK
-REL="NEXT"
-TITLE="TRANSLATION"
-HREF="x709.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x701.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x709.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN705"
->7. AGGREGATION WITH INDEPENDENT WORKS</A
-></H1
-><P
->A compilation of the Document or its derivatives with other
- separate and independent documents or works, in or on a volume of
- a storage or distribution medium, does not as a whole count as a
- Modified Version of the Document, provided no compilation
- copyright is claimed for the compilation. Such a compilation is
- called an "aggregate", and this License does not apply to the
- other self-contained works thus compiled with the Document, on
- account of their being thus compiled, if they are not themselves
- derivative works of the Document.</P
-><P
->If the Cover Text requirement of section 3 is applicable to
- these copies of the Document, then if the Document is less than
- one quarter of the entire aggregate, the Document's Cover Texts
- may be placed on covers that surround only the Document within the
- aggregate. Otherwise they must appear on covers around the whole
- aggregate.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x701.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x709.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->COLLECTIONS OF DOCUMENTS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->TRANSLATION</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x709.html b/doc/users_guide/html/x709.html
deleted file mode 100644
index b3a2a44..0000000
--- a/doc/users_guide/html/x709.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->TRANSLATION</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="AGGREGATION WITH INDEPENDENT WORKS"
-HREF="x705.html"><LINK
-REL="NEXT"
-TITLE="TERMINATION"
-HREF="x712.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x705.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x712.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN709"
->8. TRANSLATION</A
-></H1
-><P
->Translation is considered a kind of modification, so you may
- distribute translations of the Document under the terms of section
- 4. Replacing Invariant Sections with translations requires
- special permission from their copyright holders, but you may
- include translations of some or all Invariant Sections in addition
- to the original versions of these Invariant Sections. You may
- include a translation of this License provided that you also
- include the original English version of this License. In case of
- a disagreement between the translation and the original English
- version of this License, the original English version will
- prevail.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x705.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x712.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->AGGREGATION WITH INDEPENDENT WORKS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->TERMINATION</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x712.html b/doc/users_guide/html/x712.html
deleted file mode 100644
index 5c973f1..0000000
--- a/doc/users_guide/html/x712.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->TERMINATION</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="TRANSLATION"
-HREF="x709.html"><LINK
-REL="NEXT"
-TITLE="FUTURE REVISIONS OF THIS LICENSE"
-HREF="x715.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x709.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x715.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN712"
->9. TERMINATION</A
-></H1
-><P
->You may not copy, modify, sublicense, or distribute the
- Document except as expressly provided for under this License. Any
- other attempt to copy, modify, sublicense or distribute the
- Document is void, and will automatically terminate your rights
- under this License. However, parties who have received copies, or
- rights, from you under this License will not have their licenses
- terminated so long as such parties remain in full
- compliance.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x709.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x715.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->TRANSLATION</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->FUTURE REVISIONS OF THIS LICENSE</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x715.html b/doc/users_guide/html/x715.html
deleted file mode 100644
index 3483cb6..0000000
--- a/doc/users_guide/html/x715.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->FUTURE REVISIONS OF THIS LICENSE</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="TERMINATION"
-HREF="x712.html"><LINK
-REL="NEXT"
-TITLE="How to use this License for your documents"
-HREF="x720.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x712.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x720.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN715"
->10. FUTURE REVISIONS OF THIS LICENSE</A
-></H1
-><P
->The Free Software Foundation may publish new, revised
- versions of the GNU Free Documentation License from time to time.
- Such new versions will be similar in spirit to the present
- version, but may differ in detail to address new problems or
- concerns. See <A
-HREF="http://www.gnu.org/copyleft/"
-TARGET="_top"
->http://www.gnu.org/copyleft/</A
->.</P
-><P
->Each version of the License is given a distinguishing
- version number. If the Document specifies that a particular
- numbered version of this License "or any later version" applies to
- it, you have the option of following the terms and conditions
- either of that specified version or of any later version that has
- been published (not as a draft) by the Free Software Foundation.
- If the Document does not specify a version number of this License,
- you may choose any version ever published (not as a draft) by the
- Free Software Foundation.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x712.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x720.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->TERMINATION</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->How to use this License for your documents</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x720.html b/doc/users_guide/html/x720.html
deleted file mode 100644
index e4678bf..0000000
--- a/doc/users_guide/html/x720.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->How to use this License for your documents</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="FUTURE REVISIONS OF THIS LICENSE"
-HREF="x715.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x715.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
->&nbsp;</TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN720"
->How to use this License for your documents</A
-></H1
-><P
->To use this License in a document you have written, include
- a copy of the License in the document and put the following
- copyright and license notices just after the title page:</P
-><A
-NAME="AEN723"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
-> Copyright (c) YEAR YOUR NAME.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1
- or any later version published by the Free Software Foundation;
- with the Invariant Sections being LIST THEIR TITLES, with the
- Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".</P
-></BLOCKQUOTE
-><P
->If you have no Invariant Sections, write "with no Invariant
- Sections" instead of saying which ones are invariant. If you have
- no Front-Cover Texts, write "no Front-Cover Texts" instead of
- "Front-Cover Texts being LIST"; likewise for Back-Cover
- Texts.</P
-><P
->If your document contains nontrivial examples of program
- code, we recommend releasing these examples in parallel under your
- choice of free software license, such as the GNU General Public
- License, to permit their use in free software.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x715.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->FUTURE REVISIONS OF THIS LICENSE</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/html/x85.html b/doc/users_guide/html/x85.html
deleted file mode 100644
index 9d20d85..0000000
--- a/doc/users_guide/html/x85.html
+++ /dev/null
@@ -1,1762 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->The Gimp-Print Graphical User Interface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GIMP and Gutenprint"
-HREF="ch-gimp-and-gimp-print.html"><LINK
-REL="PREVIOUS"
-TITLE="GIMP and Gutenprint"
-HREF="ch-gimp-and-gimp-print.html"><LINK
-REL="NEXT"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 2. GIMP and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="c443.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN85"
->The Gimp-Print Graphical User Interface</A
-></H1
-><P
-> Now that the GIMP is displaying your picture, put your mouse over
-the picture and click the right mouse button. A menu will appear.
-Choose the
- <SPAN
-CLASS="GUIMENU"
->File</SPAN
->-&gt;<SPAN
-CLASS="GUIMENUITEM"
->Print</SPAN
->
-menu option. This will cause the Gimp-Print GUI window to appear (see
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->Figure 2-3</A
->). Move the mouse cursor
-over the various parts of the Gimp-Print GUI window, and notice that
-if you leave your mouse in one place for a short time without clicking
-any buttons, a small box appears. This box contains helpful text.
-These small boxes are called "tooltips" and are intended to remind you
-about the function of each part of the graphical interface.
- </P
-><P
->The next several sections will continuously refer to
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->Figure 2-3</A
-> and
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
->Figure 2-4</A
->. The difference between
-the two figures can be seen in the top right corner of the window.
-Notice that there are two tabs, one which reads
-<SPAN
-CLASS="GUILABEL"
->Printer Settings</SPAN
-> and another which reads
-<SPAN
-CLASS="GUILABEL"
->Image/Output Settings</SPAN
->. Notice also that the
-window is divided into several major sections which directly map to
-the major sections of this document:
- <P
-></P
-><UL
-><LI
-><P
-><A
-HREF="x85.html#AEN230"
->Preview</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN130"
->Printer Settings</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN130"
->Image/Output Settings</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN254"
->Position</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN326"
->Size</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN426"
->Printing and Saving Settings</A
-></P
-></LI
-></UL
->
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-GIMP-PRINT-GUI"
-></A
-><P
-><B
->Figure 2-3. The Gimp-Print Graphical User Interface 1 (GUI)</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-gui.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-GIMP-PRINT-GUI-1"
-></A
-><P
-><B
->Figure 2-4. The Gimp-Print Graphical User Interface 2 (GUI)</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-gui-1.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN130"
->Printer Settings</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN134"
->Printer</A
-></H3
-><P
-> Click on the <SPAN
-CLASS="GUILABEL"
->Printer Settings</SPAN
-> tab near the
-top right hand corner of the window (see
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->Figure 2-3</A
->). Then, click on the downward
-facing arrow to the right of the <SPAN
-CLASS="GUILABEL"
->Printer</SPAN
-> combo
-box to see a list of the system printer queues. Select the queue to which
-you would like the printed image to be sent. One may also print the
-image directly to a file by selecting <SPAN
-CLASS="GUIMENUITEM"
->File</SPAN
->.
-In this event, the user will be prompted for the filename when either the
-<SPAN
-CLASS="GUIBUTTON"
->Print</SPAN
-> button or the <SPAN
-CLASS="GUIBUTTON"
->Print and Save
-Settings</SPAN
-> button is clicked.
- </P
-><P
->When either the <SPAN
-CLASS="GUIBUTTON"
->Print and Save Settings</SPAN
-> button
-or the <SPAN
-CLASS="GUIBUTTON"
->Save Settings</SPAN
-> button is clicked,
-the settings are saved in a file called
-<TT
-CLASS="FILENAME"
->~/.gimp-1.2/printrc</TT
->. The user is cautioned about
-hand editing this file since it is generated by Gutenprint (although
-it was the only way that the author found for removing bogus entries
-created while playing with the <SPAN
-CLASS="GUIBUTTON"
->New Printer</SPAN
-> button).
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN148"
->Setup Printer</A
-></H3
-><P
-> Before any useful printing can occur, the user needs to associate
-the named printer with the
-actual make and model of the printer. Click the
-<SPAN
-CLASS="GUIBUTTON"
->Setup Printer</SPAN
-> button in
-the <SPAN
-CLASS="GUILABEL"
->Printer</SPAN
-> section of the window (the upper
-right, and just below the Printer display box). When this is done, the
-following window appears:
-
- <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN153"
-></A
-><P
-><B
->Figure 2-5. The Setup Printer Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-setup.png"></P
-></DIV
-></DIV
->
- </P
-><P
-> Scroll through the Printer Model section of the window until you
-find a printer which matches yours. If you cannot find the precise
-model, pick something close and hope for the best. There are selections
-for a wide array of Postscript, inkjet, and laser printers. After you
-have selected a printer, you will see the printer command displayed.
- </P
-><P
->The Gutenprint software does all of the necessary conversion of the
-image to be printed into the language of your printer. It is
-unnecessary and undesirable for any other sofware to manipulate this
-data. (This is why the command contains the "-l" switch or the "-o
-raw" switch). Please use care if you feel the need to edit this
-command. Once you are satisfied with your selection, click the
-<SPAN
-CLASS="GUIBUTTON"
->OK</SPAN
-> button.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN163"
->New Printer</A
-></H3
-><P
-> In the previous sections, the user selected an existing printer
-queue and associated a particular type of printer to that queue. For
-most cases, this is probably all that is required. However, some
-situations might require more detailed control over the handling of
-the printer data.
- </P
-><P
-> Click the <SPAN
-CLASS="GUIBUTTON"
->New Printer</SPAN
-> button to tell the
-software that you wish to create a new name. In this case, the new
-name may actually be an existing printer with different settings that
-you wish to save, or it may simply be a name associated with a
-particular command for handling the printer data. A window will
-appear thus:
-
- <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN168"
-></A
-><P
-><B
->Figure 2-6. The New Printer Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-new-printer.png"></P
-></DIV
-></DIV
->
-
- Type a name into the window and click <SPAN
-CLASS="GUIBUTTON"
->OK</SPAN
->
-(or <SPAN
-CLASS="GUIBUTTON"
->Cancel</SPAN
-> if you wish not to do this).
-Notice that the new name now appears as the selected <SPAN
-CLASS="GUILABEL"
->Printer</SPAN
->.
-As you change settings in the rest of the Gimp-Print GUI, they will be
-associated with this printer name. When the settings are saved,
-they can be recovered easily by simply selecting this named printer
-from the Printer combo box.
- </P
-><P
-> One example where this feature might be used is as follows. The
-author frequently prints photos on Epson 4x6 photo paper. Note that
-this paper is physically larger than 4x6 and it has perforations on
-all four sides. The author dislikes printing part of the image on the
-perforated parts of the paper which will be removed after
-printing the photo. By selecting the proper scaling percentage,
-printing can be constrained to the 4x6 part of the paper which will
-remain after the perforated sections are removed. The author has
-saved this setting using this feature of the Gutenprint software.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN179"
->Media Size</A
-></H3
-><P
-> The term <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->media</I
-></SPAN
-> refers to paper, card stock,
-envelopes, or whatever you have put into your printer onto which
-something will be printed. Click the arrow to the right of the
-<SPAN
-CLASS="GUILABEL"
->Media Size</SPAN
-> box to see a long list of different
-sizes of media. Choose the size that matches the media which you have
-loaded into your printer. Once you have made your choice, the drop
-down menu will disappear, and your choice will be shown in the
-<SPAN
-CLASS="GUILABEL"
->Media Size</SPAN
-> box. The available paper sizes will
-vary depending upon the printer model you have selected.
- </P
-><P
-> Some printers support arbitrary (within limits!) paper sizes.
- These printers will let you select <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Custom</I
-></SPAN
->
- or <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Roll</I
-></SPAN
-> paper sizes. When you select such a
- printer, one or both of the <SPAN
-CLASS="GUILABEL"
->Dimensions</SPAN
-> boxes
- will let you enter your paper size (in inches or centimetres). The
- boxes will not let you enter sizes that your printer cannot handle.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN189"
->Media Type</A
-></H3
-><P
-> The type of media onto which your image will be printed should be
-selected here. Click on the arrow to the right of the <SPAN
-CLASS="GUILABEL"
->Media
-Type</SPAN
-> box to see a long list of the different types of media
-onto which you may print your image. Media types include such things
-as plain paper, postcards, photo quality paper, transparencies, and
-more! Once you have made your choice, the drop down menu will
-disappear, and your choice will be shown in the <SPAN
-CLASS="GUILABEL"
->Media
-Type</SPAN
-> box. The choices available will vary depending upon
-the printer model you have selected.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN194"
->Media Source</A
-></H3
-><P
-> The <SPAN
-CLASS="GUILABEL"
->Media Source</SPAN
-> box allows the user to
- choose the paper source, sometimes called <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Input
- Slot</I
-></SPAN
->, that the paper will be fed from. Many printers
- only have one available input source (such as the standard paper
- tray), in which case this entry will be grayed out. If your printer
- does support multiple input sources, you may specify the source of
- your choice here. Some Epson printers offer a roll feed option in
- addition to the standard paper tray, and many HP LaserJet printers
- have multiple paper trays.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN199"
->Ink Type</A
-></H3
-><P
-> Some printers offer a choice of different types of ink or ink
- cartridges. Many Canon and Lexmark printers support various
- combinations of cartridges, such as black only, black and color,
- photo color, and so forth. Most Epson printers let you choose
- between three and four color printing (three color uses only color
- ink, while four color uses black ink as well). Epson printers that
- support six color photo printing allow you to choose five and six
- color printing as well.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN202"
->Resolution</A
-></H3
-><P
-> Click on the arrow to the right of the
-<SPAN
-CLASS="GUILABEL"
->Resolution</SPAN
-> box to see a long list of resolutions
-at which you can print your image. The list is written with the
-lowest resolution at the top, with increasing resolution (and
-generally improved printing quality) as you approach the bottom of the
-list. Different printers support different resolution options, and
-many printers support different quality choices using the same basic
-resolution. In this menu are a few terms which may be unfamiliar to
-you, and they will now be explained.
- </P
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN206"
->DPI</A
-></H4
-><P
-> DPI is an acronym which stands for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->D</I
-></SPAN
->ots
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->P</I
-></SPAN
->er <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->I</I
-></SPAN
->nch. This term refers
-to the number of dots that your printer will print in a space of one
-inch (approximately 2.54 cm). This is highly dependent upon the
-capability of your printer. Resolutions below 300 DPI are
-used for draft quality. For general purpose printing, select
-300 - 360 DPI. Higher quality printing can be achieved by
-selecting 600 - 720 DPI. Settings higher than this are used for the
-highest possible quality for printing photographs and other high
-quality graphics. Experiment with your printer and these settings
-with different types of graphics and photographs to see what
-results you can obtain with your printer. High resolutions (large
-numbers of dots per inch) require substantial image processing time,
-and the print files can be very large; it's not uncommon for a full
-page, 1440x720 DPI image to require 100 MB of temporary storage!
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN212"
->Draft or Fast Economy Draft</A
-></H4
-><P
-> When this text appears next to the resolution, it refers to the
-fact that the quality will be relatively low, but suitable for rough
-drafts. Draft quality is higher than fast economy draft. These
-options will give you the fastest printing speed. Economy Draft uses
-less ink, and as a result the image will be pale. These modes are
-generally not very useful for printing photographs.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN215"
->Unidirectional</A
-></H4
-><P
-> When printing an image, you have probably noticed the print
-head inside the printer moving back and forth across the print media.
-Many printers are capable of putting ink on the page regardless of
-which direction the print head is moving. However, quality can
-sometimes be improved by only putting ink on the page when the printer
-head is moving in one direction. The
-<SPAN
-CLASS="GUIMENUITEM"
->Unidirectional</SPAN
-> setting instructs the
-software to only place ink on the page when the print head is moving
-one way. When the print head returns, it will not place ink on the
-page. On many printers, the print quality is better, at the expense
-of printing speed.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN219"
->High(est) Quality</A
-></H4
-><P
-> With lower quality print modes, one may see an effect where
-the printed image looks like it has rows of stripes with a small
-separation between the stripes. This effect is called "banding" and
-is undesirable. In the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->high</I
-></SPAN
-> and
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->highest</I
-></SPAN
-> quality modes, the printer will make more
-passes over the same part of the page in order to improve quality and
-(reduce or) eliminate banding. This requires more temporary disk
-space and prints more slowly, but does not require significantly more
-processing time.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN224"
->DMT</A
-></H4
-><P
-> DMT is an acronym which stands for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->D</I
-></SPAN
->ot
- <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->M</I
-></SPAN
->odulation
- <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->T</I
-></SPAN
->echnology.
- This term refers to a print mode used by certain Canon printers
- to improve the quality of the printed output. Unfortunately,
- at this time, all of the available DMT modes do not work
- correctly. The cases which do work correctly will offer
- significantly improved printing quality.
- </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN230"
->Preview</A
-></H2
-><P
-> Notice in the upper left of the window is a preview of your image.
-This preview is a representation of where your picture will print on
-the selected media, and approximately what it will look like. This
-preview will be updated as you modify selections in the
-<SPAN
-CLASS="GUILABEL"
->Position</SPAN
->, <SPAN
-CLASS="GUILABEL"
->Size</SPAN
->,
-<SPAN
-CLASS="GUILABEL"
->Media Size</SPAN
->, and <SPAN
-CLASS="GUILABEL"
->Output Type</SPAN
->
-portions of the window. You may also select the image with your mouse
-and move it manually if you wish. In doing so, you will note that the
-<SPAN
-CLASS="GUILABEL"
->Position</SPAN
-> settings are updated accordingly. Take
-note of the arrow, which points toward the top of the media, where top
-is the first part of the media to enter the printer.
- </P
-><P
-> The preview may be moved around the page as follows:
- </P
-><P
-></P
-><UL
-><LI
-><P
-> Clicking and dragging the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->left</I
-></SPAN
->
- (primary) mouse button moves the image around the page as you would
- expect; the image moves with the mouse. </P
-></LI
-><LI
-><P
-> Clicking and dragging the
- <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->middle</I
-></SPAN
-> mouse button moves the image around the
- page in a finer fashion, such that each pixel of mouse movement
- moves the image by one point (1/72 inch). This allows very fine
- placement of the image on the page. </P
-></LI
-><LI
-><P
-> Clicking and dragging the
- <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->right</I
-></SPAN
-> (secondary) mouse button moves the image
- around the page much the same as with the left button, but the image
- will only move in units of the image size. Thus, if the image is
- one inch wide and two inches tall, the image will not move at all
- until you have moved the mouse far enough so that the image would be
- moved one inch vertically and two inches horizontally. This is
- handy if you wish to print multiple images of the same size on one
- piece of paper.</P
-></LI
-><LI
-><P
-> If you hold down the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->shift</I
-></SPAN
-> key
- on the keyboard when you click and drag the mouse, the image will
- only move in the horizontal or vertical direction (depending upon
- which way you first move the mouse). This allows you to constrain
- motion to the horizontal or vertical. </P
-></LI
-><LI
-><P
-> If you click another button while dragging the
- mouse, the image will immediately return to the position it was in
- before you clicked the mouse the first time. This allows you to
- not move the image if you have started moving it and have decided
- that you don't want to move it. The preview will not respond to the
- mouse until you release all of the mouse buttons and click and drag
- afresh. </P
-></LI
-></UL
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN254"
->Position</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN256"
->Orientation</A
-></H3
-><P
-> The Orientation menu allows the user to choose the orientation
-of the paper. The menu selections are
-<SPAN
-CLASS="GUIMENUITEM"
->Auto</SPAN
->, <SPAN
-CLASS="GUIMENUITEM"
->Portrait</SPAN
->,
-<SPAN
-CLASS="GUIMENUITEM"
->Landscape</SPAN
->, <SPAN
-CLASS="GUIMENUITEM"
->Upside
-down</SPAN
->, and <SPAN
-CLASS="GUIMENUITEM"
->Seascape</SPAN
->. Click on
-the rectangular tab to see these choices
-and make your selection. When you have done so, the pulldown menu
-will have disappeared, and your choice will appear. Also, note that
-the preview image will have changed accordingly.
- </P
-><P
-> When set to <SPAN
-CLASS="GUIMENUITEM"
->Auto</SPAN
->, the software will make an
-intelligent choice of orientation based on the dimensions of the image
-to be printed. <SPAN
-CLASS="GUIMENUITEM"
->Portrait</SPAN
-> orients the print media
-with the longest edge going from top to bottom, while
-<SPAN
-CLASS="GUIMENUITEM"
->Landscape</SPAN
-> orients the paper with the longest edge
-going from side to side. <SPAN
-CLASS="GUIMENUITEM"
->Upside down</SPAN
-> and
-<SPAN
-CLASS="GUIMENUITEM"
->Seascape</SPAN
-> orient the paper the same as
-<SPAN
-CLASS="GUIMENUITEM"
->Portrait</SPAN
-> and <SPAN
-CLASS="GUIMENUITEM"
->Landscape</SPAN
->
-respectively, with the difference being that the image is rotated 180 degrees.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN272"
->Automatic Centering</A
-></H3
-><P
-> There are three buttons that deal with centering an image. The
-leftmost button is the <SPAN
-CLASS="GUIBUTTON"
->Vertically</SPAN
-> button, the
-middle button is the <SPAN
-CLASS="GUIBUTTON"
->Both</SPAN
-> button, and
-the rightmost button is the <SPAN
-CLASS="GUIBUTTON"
->Horizontally</SPAN
->
-button. Use the <SPAN
-CLASS="GUIBUTTON"
->Both</SPAN
-> button to center your
-image both horizontally and vertically. This will cause the top and
-bottom borders to be equal, and the left and right borders to be
-equal. If you have placed your image manually by using the mouse
-button, then you may center the image in the horizontal direction only
-by clicking on the <SPAN
-CLASS="GUIBUTTON"
->Horizontally</SPAN
-> button.
-Likewise, to adjust the image only in the vertical direction, click on
-the <SPAN
-CLASS="GUIBUTTON"
->Vertically</SPAN
-> button. Note that in
-each case, the image is centered with regard to the edges of the
-media, and without regard to the printable portion of the media. Many
-printers are incapable of printing to each edge of the media. Some
-media may have edges which detach. Consult your printer documentation
-for more details regarding your printer's capabilities in this regard.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN281"
->Manual Settings</A
-></H3
-><P
-> You will notice that there are six boxes that contain numbers
-just below the Orientation menu and just above the GUI buttons related
-to centering an image. When you move the preview image manually with
-the mouse, or when you click on one of the centering buttons, the
-preview image moves and these six boxes get updated.
- </P
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN284"
->Left</A
-></H4
-><P
-> The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Left</SPAN
-> box denotes
-the number of units (cm or inches) that the left side of the image
-will be printed away from the left edge of the media. You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN291"
->Right</A
-></H4
-><P
-> The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Right</SPAN
-> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the left edge of the media. You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN298"
->Right Border</A
-></H4
-><P
-> The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Right Border</SPAN
-> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the right edge of the media. You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN305"
->Top</A
-></H4
-><P
-> The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Top</SPAN
-> box denotes
-the number of units (cm or inches) that the top side of the image
-will be printed away from the top edge of the media. You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN312"
->Bottom</A
-></H4
-><P
-> The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Bottom</SPAN
-> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the top edge of the media. You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN319"
->Bottom Border</A
-></H4
-><P
-> The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Bottom Border</SPAN
-> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the bottom edge of the media. You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
- </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN326"
->Size</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN328"
->Slider Bar and Spin Box</A
-></H3
-><P
-> The slider bar can be moved as desired by the user. Notice
-that while sliding this bar, the preview image changes accordingly.
-One will also note that several boxes in the Gimp-Print GUI change values when this bar is moved.
-These boxes are the six position boxes (left, right, right border,
-top, bottom, bottom border), the two size boxes (width and height),
-and the spin box to the right of the slider bar.
- </P
-><P
-> This slider bar is used to scale the image to a desirable size, but the same effect can
-be obtained by either clicking an arrow on the spin box to the right of this
-slider bar, or by manually typing a number into this spin box. Notice
-that by setting the spin box in this way, the slider bar is also
-moved. All of the described methods will cause the image to be
-scaled accordingly.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN332"
->Scale by Percent or PPI</A
-></H3
-><P
-> One may choose to scale the image by a percentage, or by PPI,
-which means "<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p</I
-></SPAN
->ixels <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p</I
-></SPAN
->er
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->i</I
-></SPAN
->nch". Click the radio button
-next to the word to set the desired scaling factor.
- </P
-><P
-> When scaling by a percentage, the number reflected in the spin
-box next to the slider bar represents the percentage relative
-to the full size of the selected print medium. For example, with this spin box
-set to 50, the image will be scaled to 50% of the size of the print
-medium. When set to 100, the image will attempt to fill the print
-medium, within the constraints of maintaining the proper aspect ratio
-and the margins of the selected print medium. This effect can be seen
-in the preview window.
- </P
-><P
-> When scaling by PPI, the number reflected in the spin box next to
-the slider bar represents the number of pixels that will be
-printed per inch. For example, if the user is printing a 640x480
-image at a size of 6.4x4.8 inches (as measured by the size boxes), the
-image will be printed at 100 DPI.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN340"
->Use Original Image Size</A
-></H3
-><P
-> By clicking this button, the image will be scaled to as close
-to the native size of the image as possible. This effect can
-immediately be seen in the preview image.
- </P
-><P
-> The native image size may be found or set in the GIMP by
- selecting <SPAN
-CLASS="GUIMENUITEM"
->Image/Scale Image</SPAN
-> in the
- GIMP. Under the <SPAN
-CLASS="GUILABEL"
->Print Size and Display Unit</SPAN
->
- group in the <SPAN
-CLASS="GUILABEL"
->Scale Image</SPAN
-> dialog, you can
- determine (or change) the width and height of the image, or
- choose the resolution.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN347"
->Width and Height</A
-></H3
-><P
-> These boxes show the size of the printed image in either inches
-or centimeters (depending on which unit is selected). The user may
-choose to manually modify these values. When one value is modified,
-the other value is automatically modified in order to maintain the
-aspect ratio (the ratio of width to height). This effect can be
-immediately seen in the preview image.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN350"
->Units</A
-></H3
-><P
-> The units can be set to inches or centimeters by clicking the appropriate
-radio button next to the desired unit. This setting effects the
-values printed in the six position boxes (left, right, right border,
-top, bottom, bottom border) and the two size boxes (width and height).
- </P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN353"
->Image/Output Settings</A
-></H2
-><P
-> By clicking on the tab labeled <SPAN
-CLASS="GUILABEL"
->Image/Output
-Settings</SPAN
->, the Gimp-Print window will appear as shown in
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
->Figure 2-4</A
->. Notice that there are
-two sections to this portion of the window, namely,
-<SPAN
-CLASS="GUILABEL"
->Image Type</SPAN
-> and
-<SPAN
-CLASS="GUILABEL"
->Output Type</SPAN
->.
-
- </P
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN360"
->Image Type</A
-></H3
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN362"
->Line Art</A
-></H4
-><P
-> This setting tells the printer driver to generate color
-quickly. The color is bold and bright, but color accuracy is not very
-good. There may also be some unexpectedly sharp transitions in
-colors. This mode is acceptable for printing text with small amounts
-of color, and may be acceptable for presentation graphics.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN365"
->Solid Colors</A
-></H4
-><P
-> This mode produces color which is considerably more accurate
-than the <SPAN
-CLASS="GUILABEL"
->Line Art</SPAN
-> mode, but with a reduction in performance. In
-general, hues will be accurate but tonalities may not be accurate.
-There should be no sharp transitions in colors. This mode is good for
-printing presentation graphics in most cases.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN369"
->Photograph</A
-></H4
-><P
-> This mode produces the most accurate colors and tonalities at a
-greater cost in performance. This is the mode to use when printing
-high quality photographs or other high quality images.
- </P
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN372"
->Output Type</A
-></H3
-><P
-> The user is given the choice of color, black and white, and
-grayscale. Color is selected when the desired output is to be in
-color. Greyscale will result in the printed image having various
-shades of grey. Black and white is just that. The effect of this
-setting can be seen in the preview window.
- </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN375"
->Adjust Output</A
-></H3
-><P
-> Clicking on this button causes the <SPAN
-CLASS="GUILABEL"
->Print Color Adjust</SPAN
-> window to
-appear (see <A
-HREF="x85.html#FIG-GIMP-PRINT-COLOR-ADJUST"
->Figure 2-7</A
->). In
-this window, one will see a representation of the image to be printed
-as well as several slider bars. These slider bars collectively adjust
-many different aspects of the image. The values can also be adjusted
-by clicking the arrows or by typing a value into the appropriate spin
-box on the right side of each slider bar.
- </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-GIMP-PRINT-COLOR-ADJUST"
-></A
-><P
-><B
->Figure 2-7. The Print Color Adjust Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-print-color-adjust.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN387"
->Brightness</A
-></H4
-><P
-> Adjust the brightness of the image. A setting of 0.0 gives a fully black
-image, while a 2.0 setting gives a fully white image. Values greater than 1.0 will result in
- black not being solid and highlights turning white; values less than
- 1.0 will result in white not being perfectly clear and shadows turning
- black.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN390"
->Contrast</A
-></H4
-><P
-> Adjust the contrast of the image. A setting of 0.0 gives a solid gray for the
-entire image, the exact gray depending upon the brightness chosen.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN393"
->Cyan, Magenta, Yellow</A
-></H4
-><P
->These three options allow specification of the cyan, magenta, and
-yellow levels independently, for rebalancing the levels. Normally,
-these should be adjusted to yield neutral gray, but they can be used
-for other effects.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN396"
->Saturation</A
-></H4
-><P
->Adjust the brilliance of colors. A setting of 0.0 results in pure grayscale.
-A saturation setting of less than 1.0 results in more muted colors. A
-saturation setting of greater than 1.0 results in more vibrant colors. Very high
-saturation often results in very strange effects, including
-posterization and banding that might not be expected. For normal
-purposes, the saturation should generally be set to a value less than 1.5.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN399"
->Density</A
-></H4
-><P
->Adjust the amount of ink deposited on the paper. If you have chosen the
-correct paper type and are getting ink bleeding through the paper
-or puddling, try reducing the density to the lowest value you
-can while still achieving solid black. If black is not solid
-black, even with the contrast and brightness at 1.0, try increasing
-the density. Note that changes to this setting will not be visible in
-the image preview.
- </P
-><P
->All of the supported printers actually need less than 100% ink
-density in most cases, so the actual density is something other than
-the nominal density setting. The effective density setting cannot go
-above 100%, so if a value specified will result in an excessively high
-density level, it will be silently limited to a setting of 1.0.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN403"
->Gamma</A
-></H4
-><P
->Adjust the gamma of the image, over and above the printer-specific
-correction. Gamma less than 1.0 will result in a darker image; gamma
-greater than 1.0 will result in a lighter image. Unlike brightness,
-gamma adjustment does not change the endpoints; it merely changes the
-shape of the input-&#62;output curve.
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN406"
->Dither Algorithm</A
-></H4
-><P
->The recommended dither algorithm is <SPAN
-CLASS="GUIMENUITEM"
->Adaptive
-Hybrid</SPAN
-> (which is the default) for text or other fine
-black detail, or if this is mixed with continuous tone images. The
-<SPAN
-CLASS="GUIMENUITEM"
->Ordered</SPAN
-> dithering algorithm is just as good
-(and somewhat faster) for pure continuous-tone images and photographs,
-but may yield poor results with text or other fine detail,
-particularly at high printing resolutions.
- </P
-><P
-> The <SPAN
-CLASS="GUIMENUITEM"
->Fast</SPAN
-> algorithm gives the
-fastest results at the expense of color accuracy. It is a simplified
-ordered dither. On simple four color printers (or other printers used
-in four color mode), the quality is similar to
-<SPAN
-CLASS="GUIMENUITEM"
->Ordered</SPAN
->, although dark gray rendition is
-not as good due to a simpler transfer between black and colored ink.
-With six-color printers, color rendition is somewhat worse, but it
-should be quite usable in cases where optimum quality is not critical.
-In black and white, it is an efficient way to render grayscale, but it
-may not give best results when used with variable dot size printers
-(modern Epson printers, or Canon printers using DMT). On rare three
-color printers (CMY only) the results should be identical to ordered
-dither.
- </P
-><P
-> <SPAN
-CLASS="GUIMENUITEM"
->Very Fast</SPAN
-> is even faster than
-<SPAN
-CLASS="GUIMENUITEM"
->Fast</SPAN
->, with even more loss of quality.
-Color and grayscale output will show strong patterning that resembles
-screening, although it isn't. On laser printers, and possibly on
-certain kinds of text and line art, <SPAN
-CLASS="GUIMENUITEM"
->Very
-Fast</SPAN
-> dithering may actually yield the best quality.
- </P
-><P
->Error diffusion algorithms (<SPAN
-CLASS="GUIMENUITEM"
->Hybrid
-Floyd-Steinberg</SPAN
-> is such an algorithm) perform very well
-at high densities, and are capable of
-rendering very fine detail rather well, but they tend to exhibit artifacts in
-the form of "waves" or "worms" of dots which results in noticeable
-texturing in pale areas. Furthermore, pale areas immediately adjacent
-to white take a while to "build up" sufficient error to print at all.
-This is sometimes called "tearing" or "waterfalling".
- </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN420"
->Set Defaults and Close</A
-></H4
-><P
-> When the <SPAN
-CLASS="GUIBUTTON"
->Set Defaults</SPAN
-> button is clicked,
-the slider bar settings will return to their default values. The
-dither algorithm setting is uneffected. The <SPAN
-CLASS="GUILABEL"
->Print Color
-Adjust</SPAN
-> window will close when the
-<SPAN
-CLASS="GUIBUTTON"
->Close</SPAN
-> button is clicked.
- </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN426"
->Printing and Saving Settings</A
-></H2
-><P
-> At the bottom of the Gimp-Print window, there are five buttons labeled
-<SPAN
-CLASS="GUIBUTTON"
->About</SPAN
->,
-<SPAN
-CLASS="GUIBUTTON"
->Print and Save Settings</SPAN
->,
-<SPAN
-CLASS="GUIBUTTON"
->Save Settings</SPAN
->,
-<SPAN
-CLASS="GUIBUTTON"
->Print</SPAN
->,
-and <SPAN
-CLASS="GUIBUTTON"
->Cancel</SPAN
->. The <SPAN
-CLASS="GUIBUTTON"
->About</SPAN
->
-button will show information about the Gutenprint software, such as
-the version number, authors names, project web site, and software
-licensing. After clicking on the <SPAN
-CLASS="GUIBUTTON"
->About</SPAN
->, read
-the information, and then close the window by pressing the
-<SPAN
-CLASS="GUIBUTTON"
->OK</SPAN
-> button.
- </P
-><P
-> The <SPAN
-CLASS="GUIBUTTON"
->Print and Save Settings</SPAN
-> button will
-save the current settings and then print the desired image. Recall
-that these settings are saved in <TT
-CLASS="FILENAME"
->~/.gimp-1.2/printrc</TT
->. The
-<SPAN
-CLASS="GUIBUTTON"
->Save Settings</SPAN
-> button will only save the
-settings. The <SPAN
-CLASS="GUIBUTTON"
->Print</SPAN
-> button will print the
-image only. The <SPAN
-CLASS="GUIBUTTON"
->Cancel</SPAN
-> will close the
-Gimp-Print GUI window.
- </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->GIMP and Gutenprint</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->CUPS and Gutenprint</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
-> \ No newline at end of file
diff --git a/doc/users_guide/title.sgml b/doc/users_guide/title.sgml
deleted file mode 100644
index 12d83b6..0000000
--- a/doc/users_guide/title.sgml
+++ /dev/null
@@ -1,64 +0,0 @@
- <para>
- Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.1 or any later version published by the Free Software
-Foundation with no invariant sections, no Front-Cover texts, and no
-Back-Cover texts. A copy of the license is included in <xref linkend="gfdl">.
- </para>
-
- </legalnotice>
-
- <abstract>
- <para>
- The Gutenprint Top Quality Printer Drivers (hereafter
-called Gutenprint) are a set of printer drivers written to
-take advantage of the full capabilities of a wide range of
-printers. These drivers should work on any POSIX compliant operating
-system (e.g. Linux, Solaris, IRIX, etc). This document will explain how to
-use the Gutenprint software to achieve high quality printouts from the
-<ulink url="http://www.gimp.org">GIMP</ulink> (GNU Image
-Manipulation Program) and
-<ulink url="http://www.cups.org">CUPS</ulink> (Common Unix Printing
-System).
- </para>
- <para>
- Please note that in addition to using the Gutenprint software as a
-print plugin for the GIMP, and as a set of printer drivers for CUPS, this
-software can also be compiled and used with the
-<ulink url="http://www.ghostscript.com">Ghostscript</ulink> software
-and with the
-<ulink
-url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
-software.
- </para>
- <para>
-Regardless of whether the Gutenprint software is used with the GIMP,
-CUPS, Ghostscript, or Foomatic, the print quality and printer settings
-remain the same. However, use of the Gutenprint with Ghostscript and
-Foomatic is not covered in this document. These topics may be covered
-in a future revision of this document.
- </para>
- <para>
- This document corresponds to version 4.2.0 and later of the Gutenprint
-software. This document will serve as a guide to the user, and as such
-will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
-Foomatic, or any other related software.
- </para>
-
- <para>
- Andy Stewart, the author, is the founder of the
-<ulink url="http://www.wlug.org">Worcester Linux Users' Group</ulink> in
-Worcester, Massachusetts, USA. The group was founded in July 1997 and has
-approximately 140 people on its mailing list. Monthly meetings are
-held and all are invited.
- </para>
-
- <para>
- In terms of "code", this is the author's first contribution to the
-open source community, and definitely his first experience with DocBook.
-Constructive comments, praise, words of encouragement, and the like
-will be most appreciated if e-mailed to the
-<ulink url="mailto:andystewart@attbi.com">author</ulink>.
- </para>
- </abstract>
- </bookinfo>
diff --git a/doc/users_guide/users-guide.pdf b/doc/users_guide/users-guide.pdf
deleted file mode 100644
index 54302a6..0000000
--- a/doc/users_guide/users-guide.pdf
+++ /dev/null
Binary files differ
diff --git a/doc/users_guide/users-guide.sgml b/doc/users_guide/users-guide.sgml
deleted file mode 100644
index 7a22810..0000000
--- a/doc/users_guide/users-guide.sgml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp SYSTEM "gimp.sgml">
-<!ENTITY cups SYSTEM "cups.sgml">
-<!ENTITY utils SYSTEM "utils.sgml">
-<!ENTITY gfdl SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
- <title>The User's Guide to Gutenprint - Complete Edition</title>
- <date>April 7, 2002</date>
- <pubdate>April 7, 2002</pubdate>
- <author>
- <firstname>Andy</firstname>
- <surname>Stewart</surname>
- </author>
- <copyright>
- <year>2002</year>
- <holder>Andy Stewart</holder>
- </copyright>
- <legalnotice>
- <para>The User's Guide to Gutenprint - Complete Edition,
-Copyright 2002, Andy Stewart.
- </para>
-
-&title;
-&history;
-&gimp;
-&cups;
-&utils;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/util-edition.sgml b/doc/users_guide/util-edition.sgml
deleted file mode 100644
index ed45d6c..0000000
--- a/doc/users_guide/util-edition.sgml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp SYSTEM "gimp.sgml">
-<!ENTITY cups SYSTEM "cups.sgml">
-<!ENTITY utils SYSTEM "utils.sgml">
-<!ENTITY gfdl SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
- <title>The User's Guide to the Gutenprint - UTIL Edition</title>
- <date>April 7, 2002</date>
- <pubdate>April 7, 2002</pubdate>
- <author>
- <firstname>Andy</firstname>
- <surname>Stewart</surname>
- </author>
- <copyright>
- <year>2002</year>
- <holder>Andy Stewart</holder>
- </copyright>
- <legalnotice>
- <para>The User's Guide to the Gutenprint - UTIL Edition, Copyright
-2002, Andy Stewart.
- </para>
-
-&title;
-
-<chapter><title>UTIL Edition</title>
-
- <caution><title>PLEASE NOTE</title>
-
- <para>
- This manual includes a subset of chapters from a more complete
-manual entitled <emphasis>The User's Guide to the Gutenprint Top
-Quality Printer Drivers</emphasis>. To obtain the complete manual, go
-to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
-Project</ulink> home page.
- </para>
- <para>
- This version of the manual has been specifically packaged in this
-way in an attempt to better suit the needs of people interested only
-in utility programs packaged with the Gutenprint software.
- </para>
-
- </caution>
-
-</chapter>
-
-&history;
-&utils;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/utils.sgml b/doc/users_guide/utils.sgml
deleted file mode 100644
index 36f6a18..0000000
--- a/doc/users_guide/utils.sgml
+++ /dev/null
@@ -1,421 +0,0 @@
-
- <chapter><title>Gutenprint Utilities</title>
- <sect1><title>escputil</title>
- <para>
- <emphasis>escputil</emphasis> is a command line utility which
-allows the user to perform a variety of maintenance tasks on Epson
-Stylus inkjet printers. These tasks include head alignment, head
-cleaning, nozzle check, printer identification, and retrieval of the ink
-level from the printer. In order for many of the
-<emphasis>escputil</emphasis> functions to work, the user must have
-read/write access to the raw printer device (typically /dev/lp0,
-/dev/usb/lp0, and the like). In general, these operations should be
-performed by the root user. As always, the user must insure that the
-directory containing the <emphasis>escputil</emphasis> utility is
-listed in the &dollar;PATH environment variable, or that the full path is
-specified on the command line. The examples in this section will
-assume the former.
- </para>
-
- <caution>
- <title>Caution</title>
- <para>
- The <emphasis>escputil</emphasis> utility was designed for use
-ONLY with Epson Stylus inkjet printers supported by the Gutenprint
-software. It is possible that damage MIGHT occur to your printer if
-this utility is misused or if it is used with a printer other than an
-Epson Stylus inkjet printer. It is the sole responsibility of the
-user to insure that this utility is suitable for the task at hand.
- </para>
- </caution>
-
-
- <para>
- In this section, specific examples of common usage will be
-presented. A summary of the command line switches can be
-found in the <emphasis>escputil</emphasis>(1) man page.
- </para>
-
- <sect2><title>Determining Ink Level</title>
- <para>
- Perhaps the most basic function performed by
-<emphasis>escputil</emphasis> is that of determining the amount of ink
-remaining in the printer. To do this, the user must know the name of
-the raw printer device. This is usually /dev/lp0 for a printer
-connected to the parallel port, or /dev/usb/lp0 for a printer
-connected to the USB.
- </para>
- <para>
-If there are multiple printers connected, one of them may be referenced as
-/dev/lp1 or perhaps /dev/usb/lp1. In the event of uncertainty, and if
-CUPS is in use, view the following <ulink url="http://localhost:631/printers">URL</ulink>
-with a web browser. At that URL, look for a line which reads "Device
-URI". The author's USB printer is listed as "Device URI: usb:/dev/usb/lp0".
- </para>
- <para>
-For this example, assume that the raw printer device is a USB printer
-specified as /dev/usb/lp0. To get the ink level for this printer,
-issue this command and notice the output.
- </para>
-
- <programlisting>
- <![ CDATA [
-# escputil -r /dev/usb/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
- Ink color Percent remaining
- Black 18
- Cyan 71
- Magenta 70
- Yellow 67
- Light Cyan 71
- Light Magenta 70
- ]]>
- </programlisting>
-
- <para>
-The user would substitute their own raw printer device for the one
-shown in the example after the "-r" switch. Notice that the printout
-shows the percent of ink remaining for each color of the author's
-Epson Stylus Photo 870. When the ink levels get too low, print
-quality will suffer. In the author's personal experience, ink levels
-approaching 10% begin to cause print quality degredation, but this
-will vary depending on the precise printer model.
- </para>
- </sect2>
-
- <sect2><title>Error During Ink Level Determination</title>
- <para>
- What? The example above did not work? An error message was
-printed? What does it mean? There are several possibilities,
-depending on the specific error message. If the error message is
-"Invalid argument" (see following example), the problem is that the
-2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled.
-
- <programlisting>
- <![ CDATA [
-# escputil -r /dev/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Cannot read from /dev/lp0: Invalid argument
- ]]>
- </programlisting>
-
- Another possibile cause for error is that the raw printer device
-does not have both read and write permission for the user attempting
-to access the device. In this case, the error message will read
-"Permission denied". A final possibility is that the raw printer
-device specified is incorrect, in which case the error message will
-read "No such device".
- </para>
-
- </sect2>
-
- <sect2><title>Nozzle Check</title>
- <para>
- On an inkjet printer, there are several small holes on the
-bottom of each ink cartridge through which the ink must flow smoothly
-in order to create high quality images on paper. If these holes
-become clogged, the printed image will show small gaps where there
-should have been ink. One can easily test for the existence of this
-condition by running a nozzle check. One need not be the root user to
-issue this command. Note that as shown, the command will print a
-nozzle test pattern on the default printer. If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
- </para>
- <para>
- The printer will print a series of black (and colored) slanted
-lines on the paper. Observe these lines carefully. If there are gaps
-or spaces in these lines, then the corresponding nozzle is clogged and
-the print head must be cleaned. However, if there are no gaps, the
-nozzles are clean.
- </para>
- <programlisting>
- <![ CDATA [
-# escputil -n
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Running nozzle check, please ensure paper is in the printer.
- ]]>
- </programlisting>
- </sect2>
-
- <sect2><title>Clean the Print Head</title>
- <para>
- If the printed output is showing gaps where there should have
-been ink, it is likely that one or more nozzles are clogged and the
-print head is in need of cleaning. One can verify this by first
-running a nozzle check and looking for gaps in the printout. To clean
-the print head, issue the following command. One need not be the root user to
-issue this command. Note that as shown, the command will clean the
-print head on the default printer. If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
- </para>
- <programlisting>
- <![ CDATA [
-# escputil -c
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Cleaning heads...
- ]]>
- </programlisting>
- <para>
- Nothing will be printed on the paper. The printer will make
-some noise as it cleans the print head. Wait until the printer is
-finished cleaning the print head. Afterwards, execute another nozzle
-check and insure that the print head is indeed completely clean. Note
-that the process of cleaning the print head causes ink consumption, so
-do not clean the print head any more than necessary.
- </para>
- <para>
-For severely clogged nozzles, one may have to execute two or three cycles
-of nozzle check followed by a cleaning of the print head. If the
-printer had gone unused for a long time, the nozzles may be so clogged
-with dried ink as to be unrecoverable, in which case, the best course
-of action is to replace the ink cartridge.
- </para>
- </sect2>
-
- <sect2><title>Align the Print Head</title>
- <para>
- To insure the highest quality printouts, the print head must
-be in proper physical alignment. One can check and realign the print
-head by running this interactive alignment test.
- </para>
- <para>
-The <emphasis>escputil</emphasis> utility must know the exact printer model in
-use. One may specify the model on the command line using the "-m"
-switch, or the utility can detect the printer model if the user passes
-the "-r" switch and the name of the raw printer device.
- </para>
- <para>
-Note that an unprivileged user may use this command with the "-m" switch, but that
-(in general) the root user may only use the "-r" switch (which
-requires read/write access to the raw printer device). In the case of
-multiple printers in use, the "-P" switch is required to align the
-print head on the non-default printer.
- </para>
-
- <caution>
- <title>Caution</title>
- <para>
-This utility lets you align the print head of your Epson Stylus inkjet
-printer. Misuse of this utility may cause your print quality to degrade
-and possibly damage your printer. This utility has not been reviewed by
-Seiko Epson for correctness, and is offered with no warranty at all. The
-entire risk of using this utility lies with you.
- </para>
- </caution>
-
- <para>
- Aligning the print head is an interactive process. The utility
-will print out a set of instructions and ask you for responses. Please
-read the instructions carefully and follow them precisely. A single
-sheet of paper will be needed (one can print on both sides to save paper).
- </para>
- <para>
-The following example illustrates the alignment process when issued by an
-unprivileged user who specified the printer model on the command
-line. (To obtain a list of printer models, issue the "escputil -M"
-command). Of course, your responses will vary and should be
-substituted for the responses shown in the following example.
- </para>
- <programlisting>
- <![ CDATA [
-
-*** NOTE - 870 is an illustrative example! ***
-*** You MUST use the proper printer model! ***
-*** Run: escputil -M for a listing of ***
-*** supported printer models! ***
-
-linuxpc> escputil -a -m 870
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Please read these instructions very carefully before proceeding.
-
-This utility lets you align the print head of your Epson Stylus
-inkjet printer. Misuse of this utility may cause your print
-quality to degrade and possibly damage your printer. This utility
-has not been reviewed by Seiko Epson for correctness, and is
-offered with no warranty at all. The entire risk of using this
-utility lies with you.
-
-This utility prints 3 test patterns. Each pattern looks very
-similar. The patterns consist of a series of pairs of vertical
-lines that overlap. Below each pair of lines is a number between
-1 and 15.
-
-When you inspect the pairs of lines, you should find the pair
-of lines that is best in alignment, that is, that best forms
-a single vertical line. Inspect the pairs very carefully to
-find the best match. Using a loupe or magnifying glass is
-recommended for the most critical inspection. It is also
-suggested that you use a good quality paper for the test, so
-that the lines are well-formed and do not spread through the
-paper. After picking the number matching the best pair, place
-the paper back in the paper input tray before typing it in.
-
-Each pattern is similar, but later patterns use finer dots for
-more critical alignment. You must run all of the passes to
-correctly align your printer. After running all the alignment
-passes, the alignment patterns will be printed once more. You
-should find that the middle-most pair (#8 out of the 15) is the
-best for all patterns.
-
-After the passes are printed once more, you will be offered the
-choices of (s)aving the result in the printer, (r)epeating the
-process, or (q)uitting without saving. Quitting will not restore
-the previous settings, but powering the printer off and back
-on will. If you quit, you must repeat the entire process if
-you wish to later save the results. It is essential that you
-not turn your printer off during this procedure.
-
-This procedure assumes that your printer is an Epson Stylus Photo
-870. If this is not your printer model, please type control-C now
-and choose your actual printer model.
-
-Please place a sheet of paper in your printer to begin the head
-alignment procedure.
-Press enter to continue >
-Please inspect the print, and choose the best pair of lines in
-each pattern. Type a pair number, '?' for help, or 'r' to repeat
-the procedure.
-Pass #1> 8
-Pass #2> 8
-Pass #3> 8
-Attempting to set alignment...succeeded.
-Please verify that the alignment is correct. After the alignment
-pattern is printed again, please ensure that the best pattern
-for each line is pattern 8. If it is not, you should repeat the
-process to get the best quality printing.
-Please insert a fresh sheet of paper.
-Press enter to continue >
-Please inspect the final output very carefully to ensure that your
-printer is in proper alignment. You may now:
- (s)ave the results in the printer,
- (q)uit without saving the results, or
- (r)epeat the entire process from the beginning.
-You will then be asked to confirm your choice.
-What do you want to do (s, q, r)?
-> s
-This will permanently alter the configuration of your printer.
-WARNING: this procedure has not been approved by Seiko Epson,
-and it may damage your printer. Proceed?
-Please confirm by typing 's' again that you wish to save the
-settings to your printer:
-> s
-About to save settings...succeeded!
-Your alignment settings have been saved to the printer.
- ]]>
- </programlisting>
- <para>
- The following example shows what will happen if an unprivileged
-user attempts to align the print head by specifying the raw printer
-device on the command line.
- </para>
-
- <programlisting>
- <![ CDATA [
-linuxpc> escputil -a -r /dev/usb/lp0
-Escputil version 4.2.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...
-Cannot open /dev/usb/lp0 read/write: Permission denied
- ]]>
- </programlisting>
-
- <para>
- This next example illustrates the results obtained when the root
-user issues an alignment command while specifying the raw printer
-device. Note that the output is truncated and only shows the printer
-detection output.
- </para>
-
- <programlisting>
- <![ CDATA [
-# escputil -a -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...Stylus Photo 870
-
-Please read these instructions very carefully before proceeding.
- ]]>
- </programlisting>
-
- </sect2>
-
- <sect2><title>Printer Identification</title>
- <para>
- The printer identification command will query the printer for
-make and model information. This command requires read/write access
-to the raw printer device (generally limited to the root user).
-Substitute your own raw printer device in place of the /dev/usb/lp0
-shown in the example. The output will vary depending on the precise
-printer model.
- </para>
-
- <programlisting>
- <![ CDATA [
-# escputil -d -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-@EJL ID
-MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
-EPSON Stylus Photo 870;
- ]]>
- </programlisting>
-
- </sect2>
-
- <sect2><title>More Information</title>
- <para>
- For more detailed information about the command line switches
-accepted by the <emphasis>escputil</emphasis> utility, please consult
-the man page which is supplied with the Gutenprint software. The user
-may also issue the "escputil --help" command to get a listing of supported
-command line switches. The command requires no special privileges to execute.
- </para>
-
- </sect2>
-
- </sect1>
-
- </chapter>
diff --git a/include/Makefile.in b/include/Makefile.in
index bae3aba..b008f17 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -92,6 +92,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index 4e45fe9..de24e93 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -100,6 +100,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/include/gutenprint/string-list.h b/include/gutenprint/string-list.h
index a04f9e0..0a19132 100644
--- a/include/gutenprint/string-list.h
+++ b/include/gutenprint/string-list.h
@@ -1,5 +1,5 @@
/*
- * "$Id: string-list.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: string-list.h,v 1.3 2006/07/07 22:49:14 rleigh Exp $"
*
* libgimpprint string list functions.
*
@@ -96,5 +96,5 @@ stp_string_list_is_present(const stp_string_list_t *list,
#endif /* GUTENPRINT_STRING_LIST_H */
/*
- * End of "$Id: string-list.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: string-list.h,v 1.3 2006/07/07 22:49:14 rleigh Exp $".
*/
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index 5cf92af..d2889dc 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -96,6 +96,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 5eea924..18d7446 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -97,6 +97,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index 8d5e72f..ce2b785 100644
--- a/m4/stp_release.m4
+++ b/m4/stp_release.m4
@@ -24,6 +24,6 @@
# Makefiles.
AC_DEFUN([STP_RELEASE_DATE],
[dnl Set package release date
-RELEASE_DATE="14 May 2006"
+RELEASE_DATE="22 Jul 2006"
AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
AC_SUBST(RELEASE_DATE)])
diff --git a/m4extra/pkg.m4 b/m4extra/pkg.m4
new file mode 100644
index 0000000..cbb46db
--- /dev/null
+++ b/m4extra/pkg.m4
@@ -0,0 +1,156 @@
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [$4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
diff --git a/man/Makefile.in b/man/Makefile.in
index f17d1db..fd110f0 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -93,6 +93,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/man/ijsgutenprint.1.in b/man/ijsgutenprint.1.in
index 0b3f73d..1f7a0f9 100644
--- a/man/ijsgutenprint.1.in
+++ b/man/ijsgutenprint.1.in
@@ -1,5 +1,5 @@
.\" t
-.\" $Id: ijsgutenprint.1.in,v 1.2 2005/04/18 10:54:56 rleigh Exp $
+.\" $Id: ijsgutenprint.1.in,v 1.4 2006/05/24 11:25:42 rlk Exp $
.\" Copyright (C) 2000-2002 Robert Krawitz <rlk@alum.mit.edu>
.\" Roger Leigh <rleigh@debian.org>
.\"
@@ -35,19 +35,18 @@ ijsgutenprint \- Ghostscript driver for Gutenprint
provides Ghostscript with a Gutenprint driver, supporting all printers
supported by libgutenprint.
.PP
-IJS is an initiative to improve the quality and ease of use of printing with
-Ghostscript. It permits adding or upgrading drivers without recompiling
-Ghostscript. An IJS driver runs in a separate process that communicates with
-Ghostscript via an IPC channel. The Gutenprint IJS driver may be used with
-AFPL Ghostscript, as it runs in a separate process.
+.B NOTE:
+ijsgutenprint should never be called directly. Ghostscript will run it if the
+IjsServer parameter is set to IjsServer=ijsgutenprint when invoking the IJS
+driver.
.PP
-The options for this driver are very complex. We strongly recommend
-use of a printer management system such as Foomatic rather than
-configuring a spooler manually with this driver. The driver name used
-by Foomatic is \fIgutenprint\-ijs\fP.
+.B NOTE:
+The only \fIsupported\fP method of running ijsgutenprint is via Foomatic.
+Users running ghostscript directly will not be supported. The driver name used
+by Foomatic is \fIgutenprint\-ijs.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@\fP.
.SH OPTIONS
-\fIijsgutenprint\fP accepts the following options:
-.SS Ghostscript IJS options
+\fIijsgutenprint\fP accepts the following Ghostscript IJS options. The
+Gutenprint-specific options are not documented here.
.TP
.B \-dIjsUseOutputFD
This option should be specified whenever output from Ghostscript will go to
@@ -61,205 +60,23 @@ sub-options.
\fB\-sDeviceManufacturer\fP=\fIvendor\fP \fB\-sDeviceModel\fP=\fIname\fP
This option must be supplied. There is no default. The IJS driver requires
the \fIvendor\fP (it's part of the protocol), but the ijsgutenprint driver
-ignores it. It should be CANON, EPSON, LEXMARK, or HEWLETT\-PACKARD. The value
-of the \-sDeviceModel parameter is the same as the value of the \-sModel
-parameter in the old stp driver.
-.IP
-Most or all of the Epson Stylus printers are fully functional. The others
-vary. In particular, all of the listed Epson Stylus Photo printers print in
-full 6-color photo mode; most of the others do not. The color output has also
-been better tuned for Epson Stylus printers than for others.
-.SS Gutenprint IJS options
-These options are all used in the \-sIjsParams options, except where mentioned
-otherwise. Due to their complicated nature, the options are explained in
-detail in their own sections.
-.SH PRINT RESOLUTION
-.TP
-\fBQuality\fP=\fIquality\fP
-The meaning of this is model-specific. Each printer has its own
-default value; for most printers, this is a reasonable 300 or 360 DPI
-resolution.
-.SH INK TYPES
-.TP
-\fBInkType\fP=\fIinktype\fP
-.PP
-This is printer type specific. The option names are case sensitive.
-.SH MEDIA TYPES
-.TP
-\fBMediaType\fP=\fImediatype\fP
-.PP
-This is printer type specific. The option names are case sensitive.
-.SH MEDIA SOURCES
-.TP
-\fBMediaSource\fP=\fImediasource\fP
-.PP
-This is printer type specific. The option names are case sensitive.
-.PP
-.SH MEDIA SIZES
-.TP
-\fB\-sPAPERSIZE\fP=\fIpapersize\fP
-for known Ghostscript paper sizes.
-.TP
-\fB\-dDEVICEWIDTHPOINTS\fP=\fIx\fP \fB\-dDEVICEHEIGHTPOINTS\fP=\fIy\fP
-where \fIx\fP and \fIy\fP are the width and height of the paper respectively,
-in points (1/72"). Note this is a normal gs option, \fInot\fP an IJS option.
-.PP
-This is printer-specific; we cannot list the correct values for each printer
-here. The option names are case-sensitive. This option does not set
-GhostScript up to use a paper size other than the default; it only tells the
-driver to set up the printer for a different paper size. The default paper
-size is "Letter".
-.SH COLOR BALANCING
-.TP
-\fBCyan\fP=\fIval\fP
-.TP
-\fBMagenta\fP=\fIval\fP
-.TP
-\fBYellow\fP=\fIval\fP
-.TP
-\fBBrightness\fP=\fIval\fP
-.TP
-\fBContrast\fP=\fIval\fP
-.TP
-\fBGamma\fP=\fIval\fP
-.TP
-\fBDensity\fP=\fIval\fP
-.TP
-\fBSaturation\fP=\fIval\fP
-.SH DITHERING ALGORITHMS
-.TP
-\fBDitherAlgorithm\fP=\fIalgorithm\fP
-.SH OUTPUT TYPE
-.TP
-\fB\-sProcessColorModel\fP=\fIDeviceGray\fP \fB\-dBitsPerSample\fP=1
-Black and white
-.TP
-\fB\-sProcessColorModel\fP=\fIDeviceGray\fP
-Greyscale
-.TP
-\fB\-sProcessColorModel\fP=\fIDeviceRGB\fP
-Color (RGB)
-.TP
-\fB\-sProcessColorModel\fP=\fIDeviceCMYK\fP
-Color (CMYK)
-.PP
-Note these are gs options, \fInot\fP IJS options. Choose color vs. grayscale
-output. Color output is the default. Choosing \fIDeviceGrey\fP and
-\-dBitsPerSample=1 results in only black ink (no color ink) being used, which is
-faster and usually results in the most accurate grayscale, but at the expense
-of smoothness. This prints only black and white (thresholding). This option
-always uses Fast dithering unless you specify Very Fast. If you want composite
-color (using a mixture of color and black inks to produce gray), use
-\fIDeviceGrey\fP.
-.PP
-In addition, using \fIDeviceGrey\fP uses luminance (perceived brightness) of
-red, green, and blue to choose output levels. Blue of a given intensity is
-perceived to be much darker than red, which in turn appears darker than green.
-\fIDeviceRGB\fP, \fIDeviceCYMK\fP and Saturation=0.0 (see "Saturation" above)
-do not use luminance.
-.PP
-CMYK output may be used with the IJS driver only. It is useful if
-you're printing a CMYK graphic and want explicit control over the
-inks. Generally it yields inferior quality, as Gutenprint has good
-algorithms for converting RGB (screen) into CMYK (inks) that take
-into account paper type, ink type, and other variables. In CMYK
-mode, the brightness, contrast, and saturation controls do not
-function.
-.SH IMAGE TYPE
-This option can be used to optimize the dither.
-.TP
-\fBImageType\fP=\fIval\fP
-Possible values are:
-.IP
-.TS
-li li
-lb lw(4i).
-Value Description
-_
-1 T{
-.na
-Line art (color or gray scale)
-T}
-2 T{
-Primarily solid colors or smooth gradients (color or gray scale)
-T}
-3 T{
-Continuous-tone photographs (color or gray scale)
-T}
-.TE
-.IP
-Option \fI0\fP is the fastest. It generates strong, but not particularly
-accurate, colors. There may be some fairly sharp color transitions in this
-mode.
-.IP
-Option \fI1\fP generates more accurate colors, but is slower.
-.IP
-Option \fI2\fP generates the most accurate colors, but is considerably slower.
-.PP
-Note that any of the modes may be used with either color or black & white
-output. If black and white output is requested, but a color mode used,
-composite color will be printed. This generally offers smoother tone, but less
-purity of gray or black, than pure black ink. Furthermore, it is possible to
-tune the color of the gray (to achieve warmer or cooler effects) using the
-color controls in this fashion.
-.PP
-Specifying a lower GhostScript resolution (with \-r) results in faster color
-conversion. For example, if you print at 1440x720 DPI, but specify a
-Ghostscript resolution of 360 DPI (with \-r360), output will be significantly
-faster and there will be much less difference in performance between the three
-image type options.
-.SH EXAMPLES
-Note that a lot of these options are used for demonstration; generally
-adjusting the density is a bad idea!
-.SS Example 1
-Print charts to file, using A4 paper, color, 360 dpi:
-.IP
-.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgutenprint
-.br
-.B \-sDeviceManufacturer=EPSON \-sDeviceModel=escp2\-ex
-.br
-.B \-sPAPERSIZE=a4 \-sOutputFile=itsyourchoice.prn
-.br
-.B \-sIjsParams=Density=1.6,Gamma=1.5,Saturation=0.9,\(rs
-.br
-.B Brightness=0.4,ImageType=1 foo.ps
-.SS Example 2
-Print color photograph to /dev/lp0 at maximum quality:
-.IP
-.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgutenprint
-.br
-.B \-sDeviceManufacturer=EPSON \-sDeviceModel=escp2\-870
-.br
-.B \-sOutputFile=/dev/lp0
-.br
-.B \-sIjsParams='Quality=1440x720hq,MediaType=GlossyPhoto,\(rs
-.br
-.B Density=0.8,ImageType=2' foo.ps
-.SS Example 3
-Print pure black text to stdout:
-.IP
-.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgutenprint
-.br
-.B \-sDeviceManufacturer=EPSON \-sDeviceModel=escp2\-660
-.br
-.B \-dIjsUseOutputFD \-sProcessColorModel=DeviceGray
-.br
-.B \-dBitsPerSample=1 \-sOutputFile=\-
-.br
-.B \-sIjsParams='Quality=720sw,Density=0.8' foo.ps
+ignores it.
.SH HISTORY
-The Ghostscript stp driver was originally written by Henryk Richter
+The Ghostscript \fBstp\fP driver was originally written by Henryk Richter
(buggs@comlab.uni\-rostock.de), and was integrated into Gutenprint during the
-3.1 development series. Gutenprint itself was originally written by Michael
-Sweet <mike@easysw.com>, who released up to version 2.0; Robert Krawitz
-released version 3.0. The Gutenprint development team
-(http://gimp\-print.sourceforge.net) now maintains the entire package.
+3.1 development series. Gutenprint (which was named Gimp-Print prior to
+release 5.0) itself was originally written by Michael Sweet <mike@easysw.com>,
+who released up to version 2.0; Robert Krawitz released version 3.0. The
+Gutenprint development team (http://gimp\-print.sourceforge.net) now maintains
+the entire package.
.PP
The IJS driver was originally written by Russell Lang, and incorporated into
Gutenprint (known then as Gimp-Print) in early 2002. This driver corresponds
with the IJS protocol 0.32.
+.PP
+The \fBstp\fP driver is no longer supported as of Gutenprint 5.0.
.SH COPYRIGHT
-Copyright \(co 2001\-2002 Robert Krawitz (rlk@alum.mit.edu)
+Copyright \(co 2001\-2006 Robert Krawitz (rlk@alum.mit.edu)
.PP
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
diff --git a/po/cs.gmo b/po/cs.gmo
index 9d4f71b..6b2a932 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
Binary files differ
diff --git a/po/cs.po b/po/cs.po
index a6d3c0f..36c264c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimp-print 4.2.6-pre1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2006-05-04 07:18-0400\n"
"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -15,8 +15,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Nastavit implicitní"
@@ -30,70 +32,73 @@ msgstr "EvenTone"
msgid "Hybrid EvenTone"
msgstr "EvenTone"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Letter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "EvenTone"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "EvenTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptivní hybridní"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr ""
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Rychlé"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Velmi rychlé"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybridní Floid-Steinbergovo"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Hustota:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -103,15 +108,15 @@ msgstr ""
"rozpíjí po papíře nebo se rozmazává; zvyÅ¡te hustotu, pokud Äerné oblasti "
"nejsou jednolité."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Algoritmus rozkladu barev"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -350,7 +355,7 @@ msgstr "Jiný"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Velikost"
@@ -366,61 +371,61 @@ msgstr "Velikost"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Název tiskárny:"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Velikost papíru, na který chcete tisknout"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Typ média"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Zdroj média"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
msgstr "Zdroj (vstupní otvor) média, na které tisknete"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Rozlišení"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Rozlišení a kvalita tisku"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Typ inkoustu"
@@ -428,22 +433,22 @@ msgstr "Typ inkoustu"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Typ inkoustu v tiskárně"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -453,13 +458,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Model tiskárny:"
@@ -468,97 +473,97 @@ msgstr "Model tiskárny:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Papír ColorLife"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Hustota:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Upravit vyrovnání modrozelené tisku"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Fialová"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Upravit vyrovnání fialové tisku"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Hustota:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Upravit vyrovnání žluté tisku"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Hustota:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Upravit vyrovnání modrozelené tisku"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Světle modrozelená"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Světle fialová"
@@ -568,13 +573,13 @@ msgstr "Světle fialová"
msgid "Light Yellow Transition"
msgstr "Světle modrozelená"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -616,28 +621,28 @@ msgid "CMY Color"
msgstr "Barvy CMY"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Černá"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Barva"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Černobíle"
@@ -838,15 +843,15 @@ msgstr "Gama:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Modrozelená"
@@ -855,15 +860,15 @@ msgstr "Modrozelená"
msgid "Adjust the cyan gamma"
msgstr "Upravit vyrovnání modrozelené tisku"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Fialová"
@@ -872,15 +877,15 @@ msgstr "Fialová"
msgid "Adjust the magenta gamma"
msgstr "Upravit vyrovnání fialové tisku"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Žlutá"
@@ -889,10 +894,10 @@ msgstr "Žlutá"
msgid "Adjust the yellow gamma"
msgstr "Upravit vyrovnání žluté tisku"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -901,7 +906,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Upravit vyrovnání žluté tisku"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -911,10 +916,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Upravit vyrovnání fialové tisku"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1244,172 +1249,172 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standardní"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Podávací válec"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr "Podávací válec (odříznout každou stranu)"
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr "Podávací válec (neodřezávat)"
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "RuÄní"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Tisknout do souboru?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "RuÄní výbÄ›r"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "RuÄní"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "PodavaÄ"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Fotopapír"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr "Přihrádka řezaných listů 1"
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr "Přihrádka řezaných listů 2"
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr "Automatický výběr řezaných listů"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr "RuÄní výbÄ›r"
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Výška:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Fotografie"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Å est barev foto"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "Světle modrozelená"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Světle fialová"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Černá"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Černá/tmavá žlutá"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Matný papír"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Fotopapír"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Lesklý potah"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Černá"
@@ -1597,137 +1602,138 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Upravit vyrovnání žluté tisku"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Hustota:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Upravit vyrovnání žluté tisku"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Hustota:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Upravit vyrovnání modrozelené tisku"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Lesklý potah"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Upravit vyrovnání žluté tisku"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Světle modrozelená"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Světle modrozelená"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Světle modrozelená"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Světle modrozelená"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr ""
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Tisknout do souboru?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "RuÄní"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Automaticky"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 DPI Jednosměrně"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 DPI Jednosměrně"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Tiskárna nepodporuje barevný výstup\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1887,8 +1893,8 @@ msgstr ""
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2011,24 +2017,24 @@ msgstr "600×600 DPI Äernobíle"
msgid "2400x600 DPI"
msgstr "2400×600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Barevná a Äerná cartridge"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Barevná a foto cartridge"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "Soubor PPD:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5825,51 +5831,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6378,7 +6384,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Rozměry:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Šířka:"
@@ -6387,7 +6393,7 @@ msgstr "Šířka:"
msgid "Width of the paper that you wish to print to"
msgstr "Šířka papíru, na který chcete tisknout"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Výška:"
@@ -6671,11 +6677,11 @@ msgstr ""
"Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
"tisknout"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Nastavit tiskárnu..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6683,11 +6689,11 @@ msgstr ""
"Zvolte model tiskárny, soubor PPD a příkaz, který se používá pro tisk na "
"tuto tiskárnu"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Nová tiskárna..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6695,24 +6701,24 @@ msgstr ""
"Definovat novou logickou tiskárnu. Toto může být použito pro pojmenování "
"sady nastavení, které si chcete zapamatovat pro budoucí použití."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Typ obrázku"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Měřítko:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Nastavte měřítko (velikost) obrázku"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6720,31 +6726,31 @@ msgstr ""
"Vyberte, jestli je měřítko měřeno jako procenta dostupné velikosti stránky "
"nebo poÄet výstupních bodů na palec"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Procenta"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Upravit tisk na velikost stránky"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Upravit tisk na poÄet bodů na palec"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Nastavit šířku tisku"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Nastavit výšku tisku"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6752,67 +6758,67 @@ msgstr ""
"Použít původní\n"
"velikost obrázku"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Nastavit velikost tisku na velikost obrázku"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Úprava barvy tisku"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Nastavit implicitní"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Zavřít"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Náhled obrázku"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Typ výstupu:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Typ výstupu:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Zvolte požadovaný typ výstupu"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Upravit výstup..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr "Upravit vyrovnání barev, jask, kontrast, sytost a algoritmus rozkladu"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Jednotky:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Jednotky:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Vyberte základní jednotku měření pro tisk"
@@ -6938,29 +6944,27 @@ msgstr "PodavaÄ 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "testovací tisk"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Czech"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "UTF-8"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7246,19 +7250,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Nemohu Äíst z %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Nemohu otevřít %s pro Ätení i zápis: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Nemohu zapisovat do %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7267,7 +7275,7 @@ msgstr ""
"\n"
"Nemohu zapisovat do %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7278,224 +7286,224 @@ msgstr ""
"Nemohu detekovat typ tiskárny.\n"
"Použijte prosím -m pro urÄení modelu své tiskárny.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Sytost:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "Chyba ve vstupu\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "Chyba ve vstupu\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Barva inkoustu"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Zbývá procent"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Identifikace tiskárny vyžaduje použití přímého zařízení.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Můžete zadat jen jeden model tiskárny."
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Čistím hlavy...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr "SpouÅ¡tím test trysek, pÅ™esvÄ›dÄte se prosím, že v tiskárnÄ› je papír.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7568,7 +7576,7 @@ msgstr ""
"abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7632,17 +7640,17 @@ msgstr ""
"Je důležité, abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Nemohu odeslat příkaz tiskárnÄ›, konÄím.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7661,13 +7669,13 @@ msgstr ""
"Pak budete požádáni o potvrzení svého výběru.\n"
"Co chcete udělat (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -7675,7 +7683,7 @@ msgstr ""
"PotvrÄte prosím, že chcete skonÄit bez ukládání, opÄ›tovným\n"
"napsáním 'q':\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7684,7 +7692,7 @@ msgstr ""
"Dobře, vaše tiskárna je zarovnaná, ale zarovnání nebylo uloženo.\n"
"Pokud chcete zarovnání uložit, musíte tento proces zopakovat.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7693,12 +7701,12 @@ msgstr ""
"PotvrÄte prosím, že chcete zopakovat proces zarovnávání, opÄ›tovným\n"
"napsáním 'r':\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Opakuji proces zarovnávání.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7713,17 +7721,17 @@ msgstr ""
"PotvrÄte prosím, že chcete uložit nastavení do své tiskárny, opÄ›tovným\n"
"napsáním 's':\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "Připravuji se uložit nastavení..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "selhalo!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7732,27 +7740,27 @@ msgstr ""
"Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
"zarovnávání.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "uspělo!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Vaše nastavení zarovnání bylo uloženo do tiskárny.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Nerozpoznaný příkaz.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Poslední příkaz nebyl potvrzen.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7769,12 +7777,12 @@ msgstr ""
"Pro spuštění procedury zarovnání hlav prosím vložte do své tiskárny\n"
"list papíru.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "PokraÄujte stisknutím enter > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7784,42 +7792,42 @@ msgstr ""
"Zkontrolujte prosím výtisk a zvolte nejlepší dvojici Äar v každém vzorku.\n"
"NapiÅ¡te Äíslo dvojice, '?' pro nápovÄ›du nebo 'r' pro zopakování procedury.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Průchod #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Vložte prosím nový list papíru.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Číslo mimo rozsah!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Nemohu pochopit, co jste napsali!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "Nejlepší dvojice Äar by mÄ›la mít Äíslo mezi 1 a %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Pokouším se nastavit zarovnání..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "uspělo.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7832,7 +7840,7 @@ msgstr ""
"vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
"zopakovat.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Chyba ve vstupu\n"
@@ -7841,7 +7849,7 @@ msgstr "Chyba ve vstupu\n"
msgid "Printing..."
msgstr "Tisknu..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Soubor/Tisk..."
@@ -7857,113 +7865,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "Špatný prostor barev: bps %d kanálů %d prostor %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Žádná vyrovnávací paměť řádků\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Nemohu zpracovat parametr %s=%s (oÄekávám Äíslo)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "Tiskárna musí být urÄena pomocí -sModel\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "Tiskárna %s není známý model\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Neznámá tiskárna %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Získání dalšího řádku selhalo na %.0f\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init selhalo %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Nemohu otevřít deskriptor souboru: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Nemohu otevřít %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Neznámá tiskárna %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "Å patné parametry; nemohu pokraÄovat!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Získání dalšího řádku selhalo na %.0f\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "testovací tisk"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "ijs_server_get_page_header selhalo %d\n"
@@ -8275,9 +8287,6 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n"
#~ msgid "Red Balance"
#~ msgstr "Žlutá"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "Žlutá"
diff --git a/po/da.gmo b/po/da.gmo
index 997b34a..12a9131 100644
--- a/po/da.gmo
+++ b/po/da.gmo
Binary files differ
diff --git a/po/da.po b/po/da.po
index 4adfea9..4cc0a8f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,100 +1,102 @@
-# translation of da.po to Danish
-# translation of gutenprint.po to Danish
-# translation of da8.po to Danish
-# Danish translation of gutenprint.
+# Danish translation of gutenprint-5.0.0.po
# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
-# Mogens Jaeger <mogensjaeger@get2net.dk>, 2005, 2006.
+#
# Keld Simonsen <keld@dkuug.dk>, 2001.
# Kjartan Maraas <kmaraas@gnome.org>, 2001.
-#
+# Mogens Jaeger <mogens@jaeger.tf>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: gutenprint 5.0.0-b6\n"
+"Project-Id-Version: gutenprint 5.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
-"PO-Revision-Date: 2006-05-04 07:21-0400\n"
-"Last-Translator: Mogens Jaeger <mogensjaeger@get2net.dk>\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"PO-Revision-Date: 2006-07-20 12:56+0200\n"
+"Last-Translator: Mogens Jaeger <mogens@jaeger.tf>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Danish\n"
"X-Poedit-Country: DENMARK\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
msgstr "Standard"
#: src/main/dither-main.c:47
msgid "EvenTone"
-msgstr "JævnTone"
+msgstr "EvenTone"
#: src/main/dither-main.c:48
msgid "Hybrid EvenTone"
-msgstr "Blandet JævnTone"
+msgstr "Blandet EvenTone"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
-msgstr "JævnBedre"
+msgstr "EvenBetter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
-msgstr "Blandet JævnBedre"
+msgstr "Blandet EvenBetter"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
msgid "UniTone"
-msgstr "EnkeltTone"
+msgstr "UniTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
-msgstr "Blandet EnkeltTone"
+msgstr "Blandet UniTone"
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Tilpasset Blandet"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordnet"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Hurtig"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Meget Hurtig"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Blandet Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr "Forud dithered inddata"
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
msgstr "Tæthed"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr "Udskrifts niveaujustering"
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -104,15 +106,15 @@ msgstr ""
"trækker igennem papiret, eller hvis det flyder ud. Øg tætheden hvis de sorte "
"områder ikke er gennemfarvet."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Dither-algoritme"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr "Visningsjustering"
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -125,7 +127,7 @@ msgid ""
msgstr ""
"Vælg den ditherings-algoritme der skal bruges.\n"
"Tilpasset Blandet giver sædvanligvis den bedste all-round kvalitet.\n"
-"JævnTone er en ny eksperimentel algoritme, der ofte giver excellente "
+"EvenTone er en ny eksperimentel algoritme, der ofte giver excellente "
"resultater.\n"
"Ordnet er hurtig og giver en næsten lige så god fotokvalitet.\n"
"Hurtig og Meget Hurtig er betragteligt hurtigere, og fungerer godt med tekst "
@@ -332,7 +334,7 @@ msgstr "Andet"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
msgstr "Papirstørrelse"
@@ -347,58 +349,58 @@ msgstr "Papirstørrelse"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
msgstr "Basis printerindstillinger"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
msgstr "Størrelse på det papir der skal udskrives på"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Medietype"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Mediekilde"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr "I hvilken bakke er mediet"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Opløsning"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Opløsning og kvalitet af udskriften"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Blæktype"
@@ -406,22 +408,22 @@ msgstr "Blæktype"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr "Avanceret printeropsætning"
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Blæktype i printeren"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr "Blækkanaler"
@@ -431,13 +433,13 @@ msgstr "Blækkanaler"
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr "Avanceret printerfunktionalitet"
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
msgstr "Printningstilstand"
@@ -445,87 +447,87 @@ msgstr "Printningstilstand"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
msgstr "Kerneparameter"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr "Printnings udskriftstilstand"
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr "Tosidet printning"
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr "Duplex/Tumble indstilling"
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
msgid "Cyan Density"
msgstr "Tæthed for cyan"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
msgstr "Justér tæthed for cyan"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
msgid "Magenta Density"
msgstr "Tæthed for magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
msgstr "Justér tæthed for magenta"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
msgid "Yellow Density"
msgstr "Tæthed for gul"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
msgstr "Justér tæthed for gul"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
msgid "Black Density"
msgstr "Tæthed for sort"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
msgstr "Justér tæthed for sort"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
msgstr "Lys cyan overgang"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr "Avanceret blækjustering"
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
msgstr "Lys cyan overgang"
@@ -533,13 +535,13 @@ msgstr "Lys cyan overgang"
msgid "Light Yellow Transition"
msgstr "Lys gul overgang"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr "Afbrudt"
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr "Kort kant (vend)"
@@ -580,28 +582,28 @@ msgid "CMY Color"
msgstr "CMY farver"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Sort"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Farver"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr "Sort og hvid"
@@ -783,15 +785,15 @@ msgstr "Program gamma"
msgid "Gamma value assumed by application"
msgstr "Gammaværdi som formodet af program"
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyan"
@@ -799,15 +801,15 @@ msgstr "Cyan"
msgid "Adjust the cyan gamma"
msgstr "Justér gamma for cyan"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -815,15 +817,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr "Justér gamma for magenta"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Gul"
@@ -831,10 +833,10 @@ msgstr "Gul"
msgid "Adjust the yellow gamma"
msgstr "Justér gamma for gul"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr "Rød"
@@ -842,7 +844,7 @@ msgstr "Rød"
msgid "Adjust the red gamma"
msgstr "Justér gamma for rød"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr "Grøn"
@@ -851,10 +853,10 @@ msgstr "Grøn"
msgid "Adjust the green gamma"
msgstr "Justér gamma for grøn"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr "Blå"
@@ -1156,159 +1158,155 @@ msgstr ""
"Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
"d\n"
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Rulle fødning"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr "Rulle fødning (skær efter hver side)"
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr "Rulle fødning (ingen afskæring)"
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
msgstr "Manuel fødning"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
msgstr "Udskriv på Cd"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
-#, fuzzy
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
msgid "Manual Sheet Guide"
-msgstr "Manuel udvælgelse"
+msgstr "Manuel ark guide"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
-#, fuzzy
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
msgid "Manual Feed (Front)"
-msgstr "Manuel fødning"
+msgstr "Manuel fødning (front)"
-#: src/main/print-escp2-data.c:553
-#, fuzzy
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
-msgstr "Bakke"
+msgstr "Bagerste bakke"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
-msgstr ""
+msgstr "Front bakke"
-#: src/main/print-escp2-data.c:580
-#, fuzzy
+#: src/main/print-escp2-data.c:581
msgid "Photo Board"
-msgstr "Foto sort"
+msgstr "Foto plade"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr "Tilskårne ark, bakke 1"
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr "Tilskårne ark, bakke 2"
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr "Automatisk valg af bakke"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr "Manuel udvælgelse"
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr "Hurtig økonomisk"
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr "Økonomisk"
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr "Kladde"
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
msgstr "Høj"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
msgstr "Foto"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
msgid "Super Photo"
msgstr "Super foto"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
msgid "Ultra Photo"
msgstr "Ultra foto"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr "Bedst"
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr "Lys cyan"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
msgstr "Lys magenta"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
msgstr "Lys sort"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
msgstr "Mørk gul"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
msgstr "Mat sort"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
msgstr "Foto sort"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr "Glans forbedrer"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
msgstr "Lys lys-sort"
@@ -1479,122 +1477,123 @@ msgstr "Diagram for rød"
msgid "Adjust the red map"
msgstr "Justér diagram for rød"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
msgid "Red Density"
msgstr "Tæthed for rød"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
msgstr "Justér tæthed for rød"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
msgid "Blue Density"
msgstr "Tæthed for blå"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
msgstr "Justér tæthed for blå"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
msgstr "Glansniveau"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
msgstr "Justér glansniveau"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr "Mørkgul overgang"
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr "Grå overgang"
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
msgstr "Lysgrå overgang"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
msgstr "Mørkgrå overgang"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
msgstr "Mellemgrå overgang"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
msgstr "Middelgrå overgang"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr "Fuld manuel kontrol"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr "Automatisk indstillingskontrol"
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr "Cd - 12 cm"
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr "Cd - 8 cm"
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr "Normal"
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
msgid "Print To Hub"
msgstr "Print til center"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
msgid "Manual Control"
msgstr "Manuel kontrol"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
msgstr "Automatisk"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr "Tovejs"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
msgstr "Envejs"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr "Alternativ udfyldning"
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr "Stigende udfyldning"
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr "Aftagende udfyldning"
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr "Stigende dobbelt"
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr "Vige udenom nærmeste nabo"
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Printeren understøtter ikke en ufiltreret enheds uddata ved dybde %d\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -1754,8 +1753,8 @@ msgstr "Ilford Heavy Papir"
msgid "Coated"
msgstr "Coated"
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr "Ingen"
@@ -1797,7 +1796,7 @@ msgstr "Justér sortbalance"
#: src/main/print-pcl.c:182
msgid "Plain"
-msgstr "Almindeligt"
+msgstr "Alm"
#: src/main/print-pcl.c:183
msgid "Bond"
@@ -1871,23 +1870,23 @@ msgstr "600x600 DPI monokrom"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Farve + sort patroner"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Farve + foto patroner"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr "Lang kant (standard)"
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
msgid "PPDFile"
msgstr "PPDfil"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
msgid "PPD File"
msgstr "PPD fil"
@@ -2130,19 +2129,16 @@ msgid "1440 x 1440 DPI"
msgstr "1440 x 1440 DPI"
#: src/main/escp2-resolutions.c:142
-#, fuzzy
msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
+msgstr "1440 x 1440"
#: src/main/escp2-resolutions.c:145
-#, fuzzy
msgid "1440 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI højeste kvalitet"
+msgstr "1440 x 1440 DPI høj kvalitet"
#: src/main/escp2-resolutions.c:148
-#, fuzzy
msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 720 DPI højeste kvalitet"
+msgstr "1440 x 1440 DPI højeste kvalitet"
#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
#: src/main/escp2-resolutions.c:161
@@ -2154,14 +2150,12 @@ msgid "2880 x 1440 DPI Transposed"
msgstr "2880 x 1440 DPI vendt om"
#: src/main/escp2-resolutions.c:164
-#, fuzzy
msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI højeste kvalitet"
+msgstr "2880 x 1440 DPI høj kvalitet"
#: src/main/escp2-resolutions.c:167
-#, fuzzy
msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 x 720 DPI højeste kvalitet"
+msgstr "2880 x 1440 DPI højeste kvalitet"
#: src/main/escp2-resolutions.c:171
msgid "5760 x 1440 DPI"
@@ -2765,15 +2759,15 @@ msgstr "Wide Postcard"
#: src/main/xmli18n-tmp.h:131
msgid "Chilean Office"
-msgstr ""
+msgstr "Chilean Office"
#: src/main/xmli18n-tmp.h:132
msgid "Chilean Double Letter"
-msgstr ""
+msgstr "Chilean Double Letter"
#: src/main/xmli18n-tmp.h:133
msgid "Chilean Double Office"
-msgstr ""
+msgstr "Chilean Double Office"
#: src/main/xmli18n-tmp.h:134
msgid "Custom"
@@ -5436,52 +5430,52 @@ msgid "Lexmark Valuewriter 300"
msgstr "Lexmark Valuewriter 300"
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
-
-#: src/main/xmli18n-tmp.h:800
msgid "Minolta PagePro 6"
msgstr "Minolta PagePro 6"
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:800
msgid "Minolta PagePro 6e"
msgstr "Minolta PagePro 6e"
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:801
msgid "Minolta PagePro 6ex"
msgstr "Minolta PagePro 6ex"
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:802
msgid "Minolta PagePro 8"
msgstr "Minolta PagePro 8"
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:803
msgid "Minolta PagePro 8L"
msgstr "Minolta PagePro 8L"
+#: src/main/xmli18n-tmp.h:804
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
+
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
#: src/main/xmli18n-tmp.h:811
msgid "Okidata OL400"
@@ -5980,7 +5974,7 @@ msgstr "Vis alle papirstørrelser"
msgid "Dimensions:"
msgstr "Størrelser:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Bredde:"
@@ -5989,7 +5983,7 @@ msgstr "Bredde:"
msgid "Width of the paper that you wish to print to"
msgstr "Bredden af det papir der skal udskrives på"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Højde:"
@@ -6259,11 +6253,11 @@ msgstr ""
"Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
"at udskrive til"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Opsætning printer..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6271,11 +6265,11 @@ msgstr ""
"Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
"denne printer"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Ny printer..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6283,23 +6277,23 @@ msgstr ""
"Definer en ny logisk printer. Dette kan bruges til at navngive en samling af "
"indstillinger, som du ønsker at huske til senere brug."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
msgstr "Billedstørrelse"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Skalering:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Angiv skalering (størrelse) af billedet"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr "Skalér med:"
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6307,31 +6301,31 @@ msgstr ""
"Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
"udskriftspunkter pr. tomme"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Procent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Skalér udskriften til arkstørrelsen"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Skalér udskriften til antal punkter pr. tomme"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Angiv bredden af udskriften"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Angiv højden på udskriften"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6339,64 +6333,64 @@ msgstr ""
"Brug original\n"
"billedstørrelse"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Udskrifts-farvejustering"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Sæt til standardværdier"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Luk"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Smugkig af billede"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr "Vis udskriftskanaler:"
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr "Udskrift"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Udskriftstype:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Vælg den ønskede udskriftstype"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Justér udskrift..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
msgstr "MÃ¥l-enhed:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
msgstr " "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Enheder:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Vælg basisenhed for målangivelse ved printning"
@@ -6513,28 +6507,27 @@ msgstr "Ekstra 4"
msgid "Extra 5"
msgstr "Ekstra 5"
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-msgid "Gutenprint"
-msgstr "Gutenprint"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Danish"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr "Nej"
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr "Ja"
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr "Finjustering"
@@ -6834,19 +6827,23 @@ msgstr "Læsning fra printer overskred tidsgrænsen\n"
msgid "Cannot read from %s: %s\n"
msgstr "Kan ikke læse fra %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Kan ikke åbne %s læse/skrive: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Kan ikke skrive til %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -6855,7 +6852,7 @@ msgstr ""
"\n"
"Kan ikke skrive til %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -6866,225 +6863,225 @@ msgstr ""
"Kan ikke detektere printertype.\n"
"Brug -m for at specificere din printermodel.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr "Ukendt"
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr "Status: Fejl\n"
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr "Status: Selv-printning\n"
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr "Status: Optaget\n"
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, c-format
msgid "Status: Waiting\n"
msgstr "Status: Venter\n"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr "Status: Ledig\n"
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr "Status: Sat til pause\n"
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr "Status; Renser\n"
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr "Status: Fabriksindstillet\n"
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr "Status: Lukker ned\n"
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr "Status Ukendt (%d)\n"
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr "Fejl: Fatal fejl\n"
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr "Fejl: Anden tilslutning valgt\n"
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr "Fejl: Låg åbent\n"
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr "Fejl: Papir problemer\n"
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, c-format
msgid "Error: Ink out\n"
msgstr "Fejl: Blæk slut\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, c-format
msgid "Error: Paper out\n"
msgstr "Fejl: Papir slut\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr "Fejl: Afvent returnering fra afrivningsposition\n"
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr "Fejl: Dobbeltfødningsfejl\n"
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr "Fejl: Uoprettelig papirskærerfejl\n"
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr "Fejl: Genoprettelig papirskærerproblem\n"
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr "Fejl: CD-skuffe tom\n"
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr "Fejl: Kortlæsningsfejl\n"
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr "Fejl: Skuffelåg åben\n"
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr "Fejl: Ukendt (%d)\n"
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr "Printer dyse selv-test\n"
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr "Blækniveauer:\n"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Blæk farve"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Procent tilbage"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr "Advarsel: Sort blækniveau lavt\n"
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr "Advarsel: Ukendt (%d)\n"
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr "Job-navn: "
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr "blækniveauer"
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr "status"
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr ""
"Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr "Del nummer"
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr "Dato"
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, c-format
msgid "Cannot identify printer model.\n"
msgstr "Kan ikke identificere printermodel.\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Renser hoveder...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr "Kører dyse-check, vær sikker på at der er papir i printeren.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7162,7 +7159,7 @@ msgstr ""
"processen løber.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7235,17 +7232,17 @@ msgstr ""
"processen løber.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Ikke i stand til at sende kommando til printeren, afbryder.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr "Afbryder\n"
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7264,19 +7261,19 @@ msgstr ""
"Du vil så blive bedt om at bekræfte dit valg.\n"
"Hvad vil du gøre (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr "Bekræft ved at taste 'q' igen, at du vil afbryde uden at gemme:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7285,19 +7282,19 @@ msgstr ""
"O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n"
"Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Gentager processen med at retten-ind.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7312,17 +7309,17 @@ msgstr ""
"Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
"printer:\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "Klar til at gemme indstillingerne..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "mislykkedes!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7331,27 +7328,27 @@ msgstr ""
"Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
"processen.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "lykkedes!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Dine retten-ind indstillinger er blevet gemt i printeren.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Kommandoen blev ikke genkendt.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Afsluttende kommando blev ikke bekræftet.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7368,12 +7365,12 @@ msgstr ""
"Placer et ark papir i printeren, og begynd retten-ind\n"
"processen af print hovedet.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Tryk på enter-tasten for at fortsætte > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7383,42 +7380,42 @@ msgstr ""
"Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n"
"Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Gennemløb #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Indsæt et nyt ark papir.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Antal uden for givet område!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Jeg kan ikke tolke hvad du tastede!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Prøver at sætte retten-ind..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "lykkedes.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7432,7 +7429,7 @@ msgstr ""
"Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
"bedste kvalitet i printning.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Fejl i inddata\n"
@@ -7441,7 +7438,7 @@ msgstr "Fejl i inddata\n"
msgid "Printing..."
msgstr "Udskriver..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Fil/Udskriv..."
@@ -7464,18 +7461,18 @@ msgstr ""
"ERROR: ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n"
" matcher ikke PPD filen (%s).\n"
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr ""
"ERROR: ijsgutenprint: Fejlagtigt farveområde: bps %d kanaler %d område %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "ERROR: ijsgutenprint: Ingen række buffer\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
@@ -7483,95 +7480,95 @@ msgstr ""
"ERROR: ijsgutenprint: Kan ikke fortolke parameter %s=%s (forventer et "
"nummer)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "ERROR: ijsgutenprint: Printer skal specificeres med -sDeviceModel\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "ERROR: ijsgutenprint: Printer %s er ikke en kendt model\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr "ijsgutenprint: ukendt DeviceModel %s\n"
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "ERROR: ijsgutenprint: kan ikke fortolke TopLeft %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "ERROR: ijsgutenprint: Kan ikke fortolke PaperSize %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "ERROR: ijsgutenprint: Kan ikke fortolke kurve %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s flyde %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s int %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s dimension %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s boolean %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "ERROR: ijsgutenprint: Forkert parameter %s %d\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "ERROR: ijsgutenprint: bad key code %d\n"
+msgstr "ERROR: ijsgutenprint: forkert nøglekode %d\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "ERROR: ijsgutenprint: image_init failed %d\n"
+msgstr "ERROR: ijsgutenprint: image_init fejlede %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
+msgstr "ERROR: ijsgutenprint: Ikke i stand til at åbne filbeskriver: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "ERROR: ijsgutenprint: Unable to open %s: %s\n"
+msgstr "ERROR: ijsgutenprint: Ikke i stand til at åbne %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "ERROR: ijsgutenprint: Unknown printer %s\n"
+msgstr "ERROR: ijsgutenprint: Ukendt printer %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
+msgstr "ERROR: ijsgutenprint: Forkerte parametre; kan ikke fortsætte!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
+msgstr "ERROR: ijsgutenprint: Hentning af næste række fejlede ved %.0f\n"
-#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
+#~ msgid "Gutenprint"
+#~ msgstr "Gutenprint"
diff --git a/po/de.gmo b/po/de.gmo
index e180087..5f89e8a 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 512e2ee..48dcc35 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimpprint 4.3.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2002-09-05 21:20MET\n"
"Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
"Language-Team: deutsch <gnome-de@gnome.org>\n"
@@ -15,8 +15,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Zurücksetzen"
@@ -30,70 +32,73 @@ msgstr "Ausgeglichen"
msgid "Hybrid EvenTone"
msgstr "Ausgeglichen"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Letter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "Ausgeglichen"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "Ausgeglichen"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptive Hybrid"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Abgestuft"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Schnell"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Sehr schnell"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybrid Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Empfindlichkeit:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -103,15 +108,15 @@ msgstr ""
"Verringerung läßt die Tinte durch das Papierdringen oder verschmieren, eine "
"Erhöhung kann zu schlecht gedeckten Bereichen führen."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Raster Algorythmus"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
#, fuzzy
msgid ""
"Choose the dither algorithm to be used.\n"
@@ -357,7 +362,7 @@ msgstr "Anderes"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Größe"
@@ -373,61 +378,61 @@ msgstr "Größe"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Drucker Einstellungen"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Größe des Papiers "
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Medium Type"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Medium Quelle"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
msgstr "in welchem Schacht ist das Druckmedium"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Auflösung"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Auflösung und Druckqualität"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Tintentype"
@@ -435,22 +440,22 @@ msgstr "Tintentype"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Tintenart im Drucker"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -460,13 +465,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Druckermodel:"
@@ -475,97 +480,97 @@ msgstr "Druckermodel:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Normalpapier"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Empfindlichkeit:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Stellen sie die Cyan-Balance ein"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Stellen sie die Magenta-Balance ein"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Empfindlichkeit:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Stellen sie die Gelb-Balance ein"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Empfindlichkeit:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Stellen sie die Cyan-Balance ein"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "helles Cyan"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "helles Magenta"
@@ -575,13 +580,13 @@ msgstr "helles Magenta"
msgid "Light Yellow Transition"
msgstr "helles Cyan"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -623,28 +628,28 @@ msgid "CMY Color"
msgstr "CMY Farbe"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Schwarz"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Farbe"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Schwarz-Weiß"
@@ -845,15 +850,15 @@ msgstr "Gamma:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyan"
@@ -862,15 +867,15 @@ msgstr "Cyan"
msgid "Adjust the cyan gamma"
msgstr "Stellen sie die Cyan-Balance ein"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -879,15 +884,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr "Stellen sie die Magenta-Balance ein"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Gelb"
@@ -896,10 +901,10 @@ msgstr "Gelb"
msgid "Adjust the yellow gamma"
msgstr "Stellen sie die Gelb-Balance ein"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -908,7 +913,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Stellen sie die Gelb-Balance ein"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -918,10 +923,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Stellen sie die Magenta-Balance ein"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1252,173 +1257,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Vorschub"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Manuell"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Drucke in Datei?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Manuell"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Manuell"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Schacht"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Foto Papier"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "autom. Auswahl"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Höhe:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Foto"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Sieben Farb Foto"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Sechs Farben Foto"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "helles Cyan"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "helles Magenta"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Schwarz"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Gelb"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Mattes Papier"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Foto Papier"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Glossy Film"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Schwarz"
@@ -1606,138 +1611,139 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Stellen sie die Gelb-Balance ein"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Empfindlichkeit:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Stellen sie die Gelb-Balance ein"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Empfindlichkeit:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Stellen sie die Cyan-Balance ein"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Glossy Film"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Stellen sie die Gelb-Balance ein"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "helles Cyan"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "helles Cyan"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "helles Cyan"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "helles Cyan"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Ausgabeart:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Drucke in Datei?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Ausgabeart:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Größe"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 DPI Unidirectional"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 DPI Unidirectional"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Drucker unterstützt keine Rohdatenausgabe\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
@@ -1897,8 +1903,8 @@ msgstr "Ilford schweres Papier"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2021,24 +2027,24 @@ msgstr "600×600 DPI monochrome"
msgid "2400x600 DPI"
msgstr "2400×600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Farbe+Schwarz Patrone"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Farb + Foto Patronen"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "PPD Datei:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5672,51 +5678,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6225,7 +6231,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Maße:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Breite:"
@@ -6234,7 +6240,7 @@ msgstr "Breite:"
msgid "Width of the paper that you wish to print to"
msgstr "Breite des Papiers"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Höhe:"
@@ -6522,11 +6528,11 @@ msgstr ""
"Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
"Modell...)"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Drucker einrichten..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6534,11 +6540,11 @@ msgstr ""
"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
"diesem Drucker"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "neuer Drucker..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6546,24 +6552,24 @@ msgstr ""
"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
"einen Namen geben und später unter diesem einfach aufrufen."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Größe"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Zoom:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Einstellung der Bildgröße"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6571,31 +6577,31 @@ msgstr ""
"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
"sollen"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Prozent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Bildgröße an Seitengröße anpassen"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Einstellen der Breite des Ausdrucks"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Einstellen der Höhe des Ausdrucks"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6603,68 +6609,68 @@ msgstr ""
"Benutze originale\n"
"Bildgröße"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Ausdruckgröße gleich Bildgröße"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Farbabstimmung"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Zurücksetzen"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Schließen"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Vorschau"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Ausgabeart:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Ausgabeart:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Wählen sie die gewüschte Ausgabeart:"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Ausgabeeinstellungen.."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Einheiten:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Einheiten:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Wählen sie die Basismaßeinheit für das Drucken"
@@ -6791,29 +6797,27 @@ msgstr "Schacht 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "Probeausdruck"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "German"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7109,19 +7113,24 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Kann nicht von %s: %s lesen.\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+"Zur Druckerabfrage bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Kann %s nicht lesen/beschreiben: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Kann nicht auf %s: %s schreiben.\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7130,7 +7139,7 @@ msgstr ""
"\n"
"Kann auf %s: %s nicht schreiben\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7141,225 +7150,225 @@ msgstr ""
"Kann den Druckertype nicht feststellen.\n"
"Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Farbbalance:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "Eingabefehler\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "Eingabefehler\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Farbtinte"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Prozent verbleibend"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
"Zur Druckererkennung bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Sie sollten nur ein Druckermodell angeben."
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Reinige die Köpfe...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7435,7 +7444,7 @@ msgstr ""
"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7508,17 +7517,17 @@ msgstr ""
"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Kann keinen Befehl an den Drucken senden, beende mich.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7537,13 +7546,13 @@ msgstr ""
"Sie werden um eine Bestätigung gebeten.\n"
"Was möchten sie tun (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -7551,7 +7560,7 @@ msgstr ""
"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
"sichern möchten\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7560,7 +7569,7 @@ msgstr ""
"Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
"Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7569,12 +7578,12 @@ msgstr ""
"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
"wiederholen möchten:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Wiederhole die Kopf-Ausrichtung.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7589,17 +7598,17 @@ msgstr ""
"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
"Drucker sichern möchten.\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "Wie man die Einstellungen sichert..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "gescheitert!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7608,27 +7617,27 @@ msgstr ""
"Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n"
"die Kopf-Ausrichtung wiederholen. \n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "erledigt!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Die Kopfausrichtung wurde im Drucker gespeichert.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Unbekannter Befehl.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7644,12 +7653,12 @@ msgstr ""
"\n"
"Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Drücken sie Eingabe um fortzufahren > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7661,42 +7670,42 @@ msgstr ""
"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
"wiederholen\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Durchgang #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Bitte legen sie ein neues Blatt ein.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Die Zahl ist ungültig!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Wie bitte ?????\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Beginne die Köpfe einzurichten..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "erledigt. \n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7709,7 +7718,7 @@ msgstr ""
"mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
"Vorgang wiederholen.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Eingabefehler\n"
@@ -7718,7 +7727,7 @@ msgstr "Eingabefehler\n"
msgid "Printing..."
msgstr "Drucken..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Datei/Drucken..."
@@ -7734,113 +7743,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "schlechter Farbraum: bps %d Kanäle %d Abstand %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Kein Zeilen-Speicher\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Kann den Parameter %s=%s nicht auswerten (erwarte eine Zahl)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "Der Drucker muß mit -sMODEL angegeben werden\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "Druckermodel %s ist unbekannt.\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Unbekannter Drucker %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Zeilensprung gescheitert bei % 0f \n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init gescheitert %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Kann file descriptor : %s nicht öffnen\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Kann %s: %s nicht öffnen\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Unbekannter Drucker %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "Unzulässige Parameter, breche ab!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Zeilensprung gescheitert bei % 0f \n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "Probeausdruck"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "Zeilensprung gescheitert bei % 0f \n"
@@ -7856,11 +7869,6 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
#~ msgid "Red Balance"
#~ msgstr "Stellen sie die Gelb-Balance ein"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr ""
-#~ "Zur Druckerabfrage bedarf es des Zugriffs auf die direkte "
-#~ "Schnittstelle.\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "Stellen sie die Gelb-Balance ein"
diff --git a/po/el.gmo b/po/el.gmo
index e21d6ae..e4111cf 100644
--- a/po/el.gmo
+++ b/po/el.gmo
Binary files differ
diff --git a/po/el.po b/po/el.po
index f8b2e30..fbac1c7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimp-print 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2001-12-29 20:10+0000\n"
"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,8 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-7\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
@@ -31,87 +33,90 @@ msgid "Hybrid EvenTone"
msgstr "Åêôýðùóç ÖáêÝëïõ"
#
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "ÄéáóôÜóåéò Letter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "Åêôýðùóç ÖáêÝëïõ"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "Åêôýðùóç ÖáêÝëïõ"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr ""
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
#, fuzzy
msgid "Ordered"
msgstr "ÄéÜôáîç"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Ôá÷åßá"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
#, fuzzy
msgid "Very Fast"
msgstr "Ôá÷åßá"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr ""
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Ðõêíüôçôá"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
"regions are not solid."
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -359,7 +364,7 @@ msgstr "¶ëëá"
#
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "ÌÝãåèïò"
@@ -375,62 +380,62 @@ msgstr "ÌÝãåèïò"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Ñõèìßóåéò ÅðéëïãÝá"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
#, fuzzy
msgid "Media Type"
msgstr "Åßäïò MIME"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
#, fuzzy
msgid "Media Source"
msgstr "Áíïéêôü Ëïãéóìéêü"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr ""
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "ÁíÜëõóç"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr ""
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
#, fuzzy
msgid "Ink Type"
msgstr "Ôýðïò MIME"
@@ -439,15 +444,15 @@ msgstr "Ôýðïò MIME"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
#, fuzzy
msgid "Type of ink in the printer"
msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
@@ -455,7 +460,7 @@ msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -465,13 +470,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "¼íïìá åêôõðùôÞ:"
@@ -480,97 +485,97 @@ msgstr "¼íïìá åêôõðùôÞ:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Êýñéá Óåëßäá"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Ðõêíüôçôá"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "ìþâ"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Ðõêíüôçôá"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Ðõêíüôçôá"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "ØéëÞ Âñï÷Þ"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "ØéëÞ Âñï÷Þ"
@@ -580,13 +585,13 @@ msgstr "ØéëÞ Âñï÷Þ"
msgid "Light Yellow Transition"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -634,29 +639,29 @@ msgid "CMY Color"
msgstr "+ ×ñþìá"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Ìáýñï"
#
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "×ñþìá"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Ìáõ_ñüáóðñï"
@@ -859,15 +864,15 @@ msgstr "ÃÜììá"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Êõáíü"
@@ -876,15 +881,15 @@ msgstr "Êõáíü"
msgid "Adjust the cyan gamma"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
#, fuzzy
msgid "Magenta"
msgstr "ìþâ"
@@ -894,15 +899,15 @@ msgstr "ìþâ"
msgid "Adjust the magenta gamma"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Êßôñéíï"
@@ -911,10 +916,10 @@ msgstr "Êßôñéíï"
msgid "Adjust the yellow gamma"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -923,7 +928,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -933,10 +938,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1264,176 +1269,176 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Êáíïíéêü"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
#, fuzzy
msgid "Roll Feed"
msgstr "Ñüëïò"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Åã÷åéñßäéï"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Åêôýðùóç óå Áñ÷åßï"
# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Åã÷åéñßäéï"
# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Åã÷åéñßäéï"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "ÄïêéìÞ"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Êåßìåíá"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "ÁðåðéëïãÞ"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "¾øïò:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Êñõðôïãñáößá"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Slashdot"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Slashdot"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Ìáýñï"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Êßôñéíï"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "×áñôß Ìáíßëá"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Êåßìåíá"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr ""
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Ìáýñï"
@@ -1621,138 +1626,139 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Ðõêíüôçôá"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Ðõêíüôçôá"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
msgstr ""
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "ØéëÞ Âñï÷Þ"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Byte Åîüäïõ"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Åêôýðùóç óå Áñ÷åßï"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Byte Åîüäïõ"
#
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "ÌÝãåèïò"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "360 DPI FOL2"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "360 DPI FOL2"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr ""
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1916,8 +1922,8 @@ msgstr ""
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2055,24 +2061,24 @@ msgstr "ìïíü÷ñùìï"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5909,51 +5915,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6462,7 +6468,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "ÄéáóôÜóåéò:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "ÐëÜôïò:"
@@ -6472,7 +6478,7 @@ msgstr "ÐëÜôïò:"
msgid "Width of the paper that you wish to print to"
msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "¾øïò:"
@@ -6752,160 +6758,160 @@ msgid ""
"wish to print to"
msgstr ""
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
#, fuzzy
msgid "Setup Printer..."
msgstr "Ñýèìéóç ÅêôõðùôÞ"
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr ""
#
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
#, fuzzy
msgid "New Printer..."
msgstr "Åêôýðùóç..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr ""
#
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "ÌÝãåèïò"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
#, fuzzy
msgid "Scaling:"
msgstr "ÁðïèÞêåõóç:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
#, fuzzy
msgid "Set the scale (size) of the image"
msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Ðïóïóôü"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
#, fuzzy
msgid "Scale the print to the size of the page"
msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
#
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
#, fuzzy
msgid "PPI"
msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
#, fuzzy
msgid "Set the width of the print"
msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
#, fuzzy
msgid "Set the height of the print"
msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
#, fuzzy
msgid ""
"Use Original\n"
"Image Size"
msgstr "Áñ÷éêü _ÌÝãåèïò"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
#, fuzzy
msgid "Set the print size to the size of the image"
msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
#, fuzzy
msgid "Print Color Adjust"
msgstr "Ðñùôåýùíôá ×ñþìáôá"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
#, fuzzy
msgid "Set Defaults"
msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
#
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Êëåßóéìï"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
#, fuzzy
msgid "Image preview"
msgstr "ÐáñáôçñçôÞò Åéêüíùí"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Byte Åîüäïõ"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
#, fuzzy
msgid "Output Type:"
msgstr "Byte Åîüäïõ"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
#, fuzzy
msgid "Select the desired output type"
msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr ""
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "&ÌïíÜäåò:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
#, fuzzy
msgid "Units:"
msgstr "&ÌïíÜäåò:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
#, fuzzy
msgid "Select the base unit of measurement for printing"
msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
@@ -7035,30 +7041,28 @@ msgstr "ÄïêéìÞ"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "Ôßôëïé ðñïò åêôýðùóç"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Greek"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
#, fuzzy
msgid "ISOLatin1"
msgstr "ËÜôéí"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7254,26 +7258,30 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, fuzzy, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, fuzzy, c-format
msgid "Cannot write to %s: %s\n"
msgstr "ÅããñáöÞ áäýíáôç: %s"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, fuzzy, c-format
msgid ""
"\n"
"Cannot write to %s: %s\n"
msgstr "ÅããñáöÞ áäýíáôç: %s"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7281,227 +7289,227 @@ msgid ""
"Please use -m to specify your printer model.\n"
msgstr ""
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
#
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Êïñåóìüò:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
#, fuzzy
msgid "Ink color"
msgstr " ÷ñþìá"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
#, fuzzy
msgid "Percent remaining"
msgstr "Åðß ôïéò åêáôü åëåýèåñï"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, fuzzy, c-format
msgid "Cleaning heads...\n"
msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7540,7 +7548,7 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7576,17 +7584,17 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr ""
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7598,38 +7606,38 @@ msgid ""
"What do you want to do (s, q, r)?\n"
msgstr ""
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
"If you wish to save the alignment, you must repeat this process.\n"
msgstr ""
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr ""
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, fuzzy, c-format
msgid "Repeating the alignment process.\n"
msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7639,44 +7647,44 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr ""
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr ""
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr ""
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, fuzzy, c-format
msgid "Unrecognized command.\n"
msgstr "Üãíùóôï ÷ñþìá: %s"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr ""
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7687,13 +7695,13 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
#, fuzzy
msgid "Press enter to continue > "
msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7701,43 +7709,43 @@ msgid ""
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr ""
#
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, fuzzy, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, fuzzy, c-format
msgid "Number out of range!\n"
msgstr "Áñéèìüò Óåëßäùí"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, fuzzy, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr ""
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, fuzzy, c-format
msgid "Attempting to set alignment..."
msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr ""
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7746,7 +7754,7 @@ msgid ""
"quality printing.\n"
msgstr ""
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, fuzzy, c-format
msgid "Error in input\n"
msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
@@ -7756,7 +7764,7 @@ msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
msgid "Printing..."
msgstr "Åêôõðþíåôáé .."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
#, fuzzy
msgid "<Image>/File/Print..."
msgstr "<Image>/Ößëôñá/Êåßìåíï/FreeType..."
@@ -7773,113 +7781,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "¶ãíùóôïò êùäéêüò op %u"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "¶ãíùóôïò êùäéêüò op %u"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "¶ãíùóôïò êùäéêüò op %u"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "¶ãíùóôïò êùäéêüò op %u"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr ""
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "Ôßôëïé ðñïò åêôýðùóç"
+
+#, fuzzy
#~ msgid "EPSON Stylus C50"
#~ msgstr "Stylus C60"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 78f5a36..a391f48 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
Binary files differ
diff --git a/po/en_GB.po b/po/en_GB.po
index 70968e5..808e51f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,21 +1,23 @@
# British English messages for gimp-print.
-# Copyright (C) 2001-2004 Roger Leigh.
-# Roger Leigh <rleigh@debian.org>, 2001.
+# Copyright © 2001-2006 Roger Leigh.
+# Roger Leigh <rleigh@debian.org>, 2001-2006.
# Christian Rose <menthos@menthos.com>, 2001.
msgid ""
msgstr ""
"Project-Id-Version: gimp-print\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
-"PO-Revision-Date: 2004-09-23 00:10+0100\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"PO-Revision-Date: 2006-05-29 12:39+0100\n"
"Last-Translator: Roger Leigh <rleigh@debian.org>\n"
"Language-Team: British English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
msgstr "Default"
@@ -27,68 +29,69 @@ msgstr "EvenTone"
msgid "Hybrid EvenTone"
msgstr "Hybrid EvenTone"
-#: src/main/dither-main.c:54
-#, fuzzy
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
-msgstr "Letter"
+msgstr "EvenBetter"
-#: src/main/dither-main.c:55
-#, fuzzy
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
-msgstr "Hybrid EvenTone"
+msgstr "Hybrid EvenBetter"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
msgid "UniTone"
msgstr "UniTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr "Hybrid UniTone"
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptive Hybrid"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordered"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Fast"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Very Fast"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybrid Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr "Predithered Input"
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
msgstr "Density"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr "Output Level Adjustment"
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -98,15 +101,15 @@ msgstr ""
"ink bleeds through the paper or smears; increase the density if black "
"regions are not solid."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Dither Algorithm"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr "Screening Adjustment"
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -270,9 +273,8 @@ msgid "Plain Paper"
msgstr "Plain Paper"
#: src/main/print-canon.c:1448
-#, fuzzy
msgid "Plain Paper PIXMA"
-msgstr "Plain Paper"
+msgstr "Plain Paper PIXMA"
#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
@@ -327,7 +329,7 @@ msgstr "Other"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
msgstr "Page Size"
@@ -342,58 +344,58 @@ msgstr "Page Size"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
msgstr "Basic Printer Setup"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
msgstr "Size of the paper being printed to"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Media Type"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr "Type of media (plain paper, photo paper, etc.)"
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Media Source"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr "Source (input slot) of the media"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Resolution"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Resolution and quality of the print"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Ink Type"
@@ -401,22 +403,22 @@ msgstr "Ink Type"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr "Advanced Printer Setup"
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Type of ink in the printer"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr "Ink Channels"
@@ -426,13 +428,13 @@ msgstr "Ink Channels"
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr "Advanced Printer Functionality"
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
msgstr "Printing Mode"
@@ -440,95 +442,87 @@ msgstr "Printing Mode"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
msgstr "Core Parameter"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr "Printing Output Mode"
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr "Double-Sided Printing"
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr "Duplex/Tumble Setting"
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
-#, fuzzy
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
msgid "Cyan Density"
-msgstr "Density"
+msgstr "Cyan Density"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
-#, fuzzy
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
-msgstr "Adjust the cyan balance"
+msgstr "Adjust the cyan density"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
-#, fuzzy
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
msgid "Magenta Density"
-msgstr "Magenta Curve"
+msgstr "Magenta Density"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
-#, fuzzy
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
-msgstr "Adjust the magenta balance"
+msgstr "Adjust the magenta density"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
-#, fuzzy
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
msgid "Yellow Density"
-msgstr "Density"
+msgstr "Yellow Density"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
-#, fuzzy
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
-msgstr "Adjust the yellow balance"
+msgstr "Adjust the yellow density"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
-#, fuzzy
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
msgid "Black Density"
-msgstr "Density"
+msgstr "Black Density"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
-#, fuzzy
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
-msgstr "Adjust the black balance"
+msgstr "Adjust the black density"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
msgstr "Light Cyan Transition"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr "Advanced Ink Adjustment"
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
msgstr "Light Magenta Transition"
@@ -536,13 +530,13 @@ msgstr "Light Magenta Transition"
msgid "Light Yellow Transition"
msgstr "Light Yellow Transition"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr "Off"
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr "Short Edge (Flip)"
@@ -559,13 +553,12 @@ msgid "Manual without Pause"
msgstr "Manual without Pause"
#: src/main/print-canon.c:1923
-#, fuzzy
msgid "Cassette"
-msgstr "Matte Paper"
+msgstr "Cassette"
#: src/main/print-canon.c:1924
msgid "CD tray"
-msgstr ""
+msgstr "CD tray"
#: src/main/print-canon.c:2049
msgid "Photo CcMmYK Color"
@@ -584,28 +577,28 @@ msgid "CMY Color"
msgstr "CMY Colour"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Black"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Colour"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr "Black and White"
@@ -619,7 +612,7 @@ msgstr "Bright Colours"
#: src/main/print-color.c:52
msgid "Correct Hue Only"
-msgstr ""
+msgstr "Correct Hue Only"
#: src/main/print-color.c:53
msgid "Uncorrected"
@@ -648,25 +641,24 @@ msgid "Grayscale"
msgstr "Grayscale"
#: src/main/print-color.c:123
-#, fuzzy
msgid "Whitescale"
-msgstr "White curve"
+msgstr "Whitescale"
#: src/main/print-color.c:125
msgid "RGB"
-msgstr ""
+msgstr "RGB"
#: src/main/print-color.c:127
msgid "CMY"
-msgstr ""
+msgstr "CMY"
#: src/main/print-color.c:129
msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
#: src/main/print-color.c:131
msgid "KCMY"
-msgstr ""
+msgstr "KCMY"
#: src/main/print-color.c:165 src/main/print-color.c:446
msgid "Channel "
@@ -733,13 +725,12 @@ msgid "Raw Channels"
msgstr "Raw Channels"
#: src/main/print-color.c:216
-#, fuzzy
msgid "SimpleGamma"
-msgstr "AppGamma"
+msgstr "SimpleGamma"
#: src/main/print-color.c:217
msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "Do not correct for screen gamma"
#: src/main/print-color.c:224
msgid "Brightness"
@@ -789,15 +780,15 @@ msgstr "AppGamma"
msgid "Gamma value assumed by application"
msgstr "Gamma value assumed by application"
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyan"
@@ -805,15 +796,15 @@ msgstr "Cyan"
msgid "Adjust the cyan gamma"
msgstr "Adjust the cyan gamma"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -821,15 +812,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr "Adjust the magenta gamma"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Yellow"
@@ -837,10 +828,10 @@ msgstr "Yellow"
msgid "Adjust the yellow gamma"
msgstr "Adjust the yellow gamma"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr "Red"
@@ -848,7 +839,7 @@ msgstr "Red"
msgid "Adjust the red gamma"
msgstr "Adjust the red gamma"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr "Green"
@@ -857,10 +848,10 @@ msgstr "Green"
msgid "Adjust the green gamma"
msgstr "Adjust the green gamma"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr "Blue"
@@ -878,32 +869,28 @@ msgstr "Cyan Balance"
#: src/main/print-color.c:322 src/main/print-color.c:330
#: src/main/print-color.c:338
-#, fuzzy
msgid "GrayBalance"
-msgstr "Grayscale"
+msgstr "GrayBalance"
#: src/main/print-color.c:323
-#, fuzzy
msgid "Adjust the cyan gray balance"
-msgstr "Adjust the cyan balance"
+msgstr "Adjust the cyan gray balance"
#: src/main/print-color.c:330 src/main/print-olympus.c:1338
msgid "Magenta Balance"
msgstr "Magenta Balance"
#: src/main/print-color.c:331
-#, fuzzy
msgid "Adjust the magenta gray balance"
-msgstr "Adjust the magenta balance"
+msgstr "Adjust the magenta gray balance"
#: src/main/print-color.c:338 src/main/print-olympus.c:1346
msgid "Yellow Balance"
msgstr "Yellow Balance"
#: src/main/print-color.c:339
-#, fuzzy
msgid "Adjust the yellow gray balance"
-msgstr "Adjust the yellow balance"
+msgstr "Adjust the yellow gray balance"
#: src/main/print-color.c:346
msgid "Saturation"
@@ -1166,168 +1153,157 @@ msgstr ""
"Image is too long for the page: top margin is %d, height %d, bottom edge is %"
"d\n"
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Roll Feed"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr "Roll Feed (cut each page)"
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr "Roll Feed (do not cut)"
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
msgstr "Manual Feed"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
msgstr "Print to CD"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
-#, fuzzy
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
msgid "Manual Sheet Guide"
-msgstr "Manual Selection"
+msgstr "Manual Sheet Guide"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
-#, fuzzy
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
msgid "Manual Feed (Front)"
-msgstr "Manual Feed"
+msgstr "Manual Feed (Front)"
-#: src/main/print-escp2-data.c:553
-#, fuzzy
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
-msgstr "Tray"
+msgstr "Rear Tray"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
-msgstr ""
+msgstr "Front Tray"
-#: src/main/print-escp2-data.c:580
-#, fuzzy
+#: src/main/print-escp2-data.c:581
msgid "Photo Board"
-msgstr "Photo Paper"
+msgstr "Photo Board"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr "Cut Sheet Bin 1"
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr "Cut Sheet Bin 2"
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr "Cut Sheet Autoselect"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr "Manual Selection"
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr "Fast Economy"
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr "Economy"
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr "Draft"
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
msgstr "High"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
msgstr "Photo"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
msgid "Super Photo"
msgstr "Super Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
msgid "Ultra Photo"
msgstr "Ultra Photo"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr "Best"
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
-#, fuzzy
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
-msgstr "Light Cyan/Red"
+msgstr "Light Cyan"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
-#, fuzzy
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
-msgstr "Light Magenta/Blue"
+msgstr "Light Magenta"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
-#, fuzzy
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
-msgstr "Black"
+msgstr "Light Black"
-#: src/main/print-escp2-data.c:810
-#, fuzzy
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
-msgstr "Black/Dark Yellow"
+msgstr "Dark Yellow"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
-#, fuzzy
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
-msgstr "Matte Paper"
+msgstr "Matte Black"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
-#, fuzzy
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
-msgstr "Photo Paper"
+msgstr "Photo Black"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr "Gloss Optimiser"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
-#, fuzzy
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
-msgstr "Black"
+msgstr "Light Light Black"
#: src/main/print-escp2.c:159
msgid "Automatic Printing Mode"
@@ -1373,11 +1349,11 @@ msgstr "Resolution of the print"
#: src/main/print-escp2.c:230
msgid "Enhanced Gloss"
-msgstr ""
+msgstr "Enhanced Gloss"
#: src/main/print-escp2.c:231
msgid "Add gloss enhancement"
-msgstr ""
+msgstr "Add gloss enhancement"
#: src/main/print-escp2.c:236
msgid "Ink Set"
@@ -1449,186 +1425,170 @@ msgid "Supports Packet Mode"
msgstr "Supports Packet Mode"
#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
-#, fuzzy
msgid "Channel Names"
-msgstr "Channel "
+msgstr "Channel Names"
#: src/main/print-escp2.c:327
msgid "Raw Channel Count"
msgstr "Raw Channel Count"
#: src/main/print-escp2.c:332
-#, fuzzy
msgid "Cyan Map"
-msgstr "Cyan"
+msgstr "Cyan Map"
#: src/main/print-escp2.c:333
-#, fuzzy
msgid "Adjust the cyan map"
-msgstr "Adjust the cyan gamma"
+msgstr "Adjust the cyan map"
#: src/main/print-escp2.c:338
-#, fuzzy
msgid "Magenta Map"
-msgstr "Magenta"
+msgstr "Magenta Map"
#: src/main/print-escp2.c:339
-#, fuzzy
msgid "Adjust the magenta map"
-msgstr "Adjust the magenta gamma"
+msgstr "Adjust the magenta map"
#: src/main/print-escp2.c:344
-#, fuzzy
msgid "Yellow Map"
-msgstr "Yellow"
+msgstr "Yellow Map"
#: src/main/print-escp2.c:345
-#, fuzzy
msgid "Adjust the yellow map"
-msgstr "Adjust the yellow gamma"
+msgstr "Adjust the yellow map"
#: src/main/print-escp2.c:350
-#, fuzzy
msgid "Blue Map"
-msgstr "Hue Map"
+msgstr "Blue Map"
#: src/main/print-escp2.c:351
-#, fuzzy
msgid "Adjust the blue map"
-msgstr "Adjust the blue gamma"
+msgstr "Adjust the blue map"
#: src/main/print-escp2.c:356
-#, fuzzy
msgid "Red Map"
-msgstr "Hue Map"
+msgstr "Red Map"
#: src/main/print-escp2.c:357
-#, fuzzy
msgid "Adjust the red map"
-msgstr "Adjust the red gamma"
+msgstr "Adjust the red map"
-#: src/main/print-escp2.c:445
-#, fuzzy
+#: src/main/print-escp2.c:447
msgid "Red Density"
-msgstr "Density"
+msgstr "Red Density"
-#: src/main/print-escp2.c:446
-#, fuzzy
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
-msgstr "Adjust the red balance"
+msgstr "Adjust the red density"
-#: src/main/print-escp2.c:453
-#, fuzzy
+#: src/main/print-escp2.c:455
msgid "Blue Density"
-msgstr "Density"
+msgstr "Blue Density"
-#: src/main/print-escp2.c:454
-#, fuzzy
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
-msgstr "Adjust the blue balance"
+msgstr "Adjust the blue density"
-#: src/main/print-escp2.c:461
-#, fuzzy
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
-msgstr "Glossy Film"
+msgstr "Gloss Level"
-#: src/main/print-escp2.c:462
-#, fuzzy
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
-msgstr "Adjust the gloss balance"
+msgstr "Adjust the gloss level"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr "Dark Yellow Transition"
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr "Gray Transition"
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
msgstr "Light Gray Transition"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
msgstr "Dark Gray Transition"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
msgstr "Mid Gray Transition"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
msgstr "Medium Gray Transition"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr "Full Manual Control"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr "Automatic Setting Control"
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr "CD - 5 inch"
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr "CD - 3 inch"
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr "Normal"
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
msgid "Print To Hub"
msgstr "Print To Hub"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
msgid "Manual Control"
msgstr "Manual Control"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
msgstr "Automatic"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr "Bidirectional"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
msgstr "Unidirectional"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr "Alternate Fill"
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr "Ascending Fill"
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr "Descending Fill"
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr "Ascending Double"
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr "Nearest Neighbour Avoidance"
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "This printer does not support raw printer output at depth %d\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr "Print options not verified; cannot print.\n"
@@ -1785,32 +1745,29 @@ msgid "Ilford Heavy Paper"
msgstr "Ilford Heavy Paper"
#: src/main/print-olympus.c:265
-#, fuzzy
msgid "Coated"
-msgstr "Card"
+msgstr "Coated"
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr "None"
#: src/main/print-olympus.c:859
-#, fuzzy
msgid "Glossy"
-msgstr "Glossy Film"
+msgstr "Glossy"
#: src/main/print-olympus.c:860
msgid "Texture"
-msgstr ""
+msgstr "Texture"
#: src/main/print-olympus.c:861
-#, fuzzy
msgid "Matte"
-msgstr "Matte Paper"
+msgstr "Matte"
#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
msgid "Laminate Pattern"
-msgstr ""
+msgstr "Laminate Pattern"
#: src/main/print-olympus.c:1331
msgid "Adjust the cyan balance"
@@ -1908,23 +1865,23 @@ msgstr "600×600 DPI monochrome"
msgid "2400x600 DPI"
msgstr "2400×600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Colour + Black Cartridges"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Colour + Photo Cartridges"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr "Long Edge (Standard)"
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
msgid "PPDFile"
msgstr "PPDFile"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
msgid "PPD File"
msgstr "PPD File"
@@ -1934,14 +1891,12 @@ msgid "Image dimensions must match paper dimensions"
msgstr "Image dimensions must match paper dimensions"
#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
-#, fuzzy
msgid "Two Level Grayscale"
-msgstr "Grayscale"
+msgstr "Two Level Grayscale"
#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
-#, fuzzy
msgid "Three Level Grayscale"
-msgstr "Grayscale"
+msgstr "Three Level Grayscale"
#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
@@ -1949,93 +1904,84 @@ msgstr "Grayscale"
#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
msgid "Quadtone"
-msgstr ""
+msgstr "Quadtone"
#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
-#, fuzzy
msgid "Six Color Enhanced Composite"
-msgstr "Five Colour Photo Composite"
+msgstr "Six Colour Enhanced Composite"
#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
-#, fuzzy
msgid "Seven Color Photo"
-msgstr "Six Colour Photo"
+msgstr "Seven Colour Photo"
#: src/main/escp2-channels.c:1498
msgid "Seven Color Enhanced"
-msgstr ""
+msgstr "Seven Colour Enhanced"
#: src/main/escp2-channels.c:1535
-#, fuzzy
msgid "Eight Color Photo"
-msgstr "Six Colour Photo"
+msgstr "Eight Colour Photo"
#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
msgid "One Color Raw"
-msgstr ""
+msgstr "One Colour Raw"
#: src/main/escp2-channels.c:1695
msgid "One Color Raw Enhanced Gloss"
-msgstr ""
+msgstr "One Colour Raw Enhanced Gloss"
#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
msgid "Two Color Raw"
-msgstr ""
+msgstr "Two Colour Raw"
#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
#: src/main/escp2-channels.c:1829
-#, fuzzy
msgid "Three Color Raw"
-msgstr "Three Colour Composite"
+msgstr "Three Colour Raw"
#: src/main/escp2-channels.c:1762
-#, fuzzy
msgid "Three Color Raw Gloss"
-msgstr "Three Colour Composite"
+msgstr "Three Colour Raw Gloss"
#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
-#, fuzzy
msgid "Four Color Raw"
-msgstr "Four Colour Standard"
+msgstr "Four Colour Raw"
#: src/main/escp2-channels.c:1884
-#, fuzzy
msgid "Four Color Raw Gloss"
-msgstr "Four Colour Standard"
+msgstr "Four Colour Raw Gloss"
#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
msgid "Five Color Raw"
-msgstr ""
+msgstr "Five Colour Raw"
#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
-#, fuzzy
msgid "Six Color Raw"
-msgstr "Six Colour Photo"
+msgstr "Six Colour Raw"
#: src/main/escp2-channels.c:1962
msgid "Six Color Enhanced Gloss Raw"
-msgstr ""
+msgstr "Six Colour Enhanced Gloss Raw"
#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
#: src/main/escp2-channels.c:2007
msgid "Seven Color Raw"
-msgstr ""
+msgstr "Seven Colour Raw"
#: src/main/escp2-channels.c:2024
msgid "Seven Color Enhanced Gloss Raw"
-msgstr ""
+msgstr "Seven Colour Enhanced Gloss Raw"
#: src/main/escp2-channels.c:2042
-#, fuzzy
msgid "Eight Color Raw"
-msgstr "Six Colour Photo"
+msgstr "Eight Colour Raw"
#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
@@ -2045,23 +1991,21 @@ msgstr "Six Colour Photo"
#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
msgid "EPSON Standard Inks"
-msgstr ""
+msgstr "EPSON Standard Inks"
#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
-#, fuzzy
msgid "UltraChrome Photo Black"
-msgstr "Ultra Photo"
+msgstr "UltraChrome Photo Black"
#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
msgid "UltraChrome Matte Black"
-msgstr ""
+msgstr "UltraChrome Matte Black"
#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
-#, fuzzy
msgid "Plain Paper Fast Load"
-msgstr "Plain Paper"
+msgstr "Plain Paper Fast Load"
#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
@@ -2073,278 +2017,236 @@ msgstr "Postcard"
#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
-#, fuzzy
msgid "Back Light Film"
-msgstr "Back Print Film"
+msgstr "Back Light Film"
#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
-#, fuzzy
msgid "Matte Paper Heavyweight"
-msgstr "Matte Paper"
+msgstr "Matte Paper Heavyweight"
#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
-#, fuzzy
msgid "Premium Semigloss Photo Paper"
-msgstr "Premium Glossy Photo Paper"
+msgstr "Premium Semigloss Photo Paper"
#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
-#, fuzzy
msgid "ColorLife Paper"
-msgstr "Core Parameter"
+msgstr "ColorLife Paper"
#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
#: src/main/escp2-papers.c:1418
-#, fuzzy
msgid "Archival Matte Paper"
-msgstr "Matte Paper"
+msgstr "Archival Matte Paper"
#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
#: src/main/escp2-papers.c:1420
msgid "Watercolor Paper - Radiant White"
-msgstr ""
+msgstr "Watercolour Paper - Radiant White"
#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
-#, fuzzy
msgid "360 x 90 DPI Fast Economy"
-msgstr "Fast Economy"
+msgstr "360 × 90 DPI Fast Economy"
#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
msgid "360 x 120 DPI Economy"
-msgstr "600×600 DPI monochrome"
+msgstr "360 × 120 DPI Economy"
#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
-#, fuzzy
msgid "180 DPI Economy"
-msgstr "Economy"
+msgstr "180 DPI Economy"
#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
-#, fuzzy
msgid "360 x 180 DPI Draft"
-msgstr "180×180 DPI DMT"
+msgstr "360 × 180 DPI Draft"
#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
msgid "360 x 240 DPI Draft"
-msgstr "360×360 DPI DMT"
+msgstr "360 × 240 DPI Draft"
#: src/main/escp2-resolutions.c:68
-#, fuzzy
msgid "360 DPI High Quality"
-msgstr "600 DPI high quality"
+msgstr "360 DPI High Quality"
#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
#: src/main/escp2-resolutions.c:77
-#, fuzzy
msgid "360 DPI"
-msgstr "600 DPI"
+msgstr "360 DPI"
#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
-#, fuzzy
msgid "720 x 360 DPI"
-msgstr "720×360 DPI"
+msgstr "720 × 360 DPI"
#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
-#, fuzzy
msgid "720 DPI"
-msgstr "1200 DPI"
+msgstr "720 DPI"
#: src/main/escp2-resolutions.c:94
-#, fuzzy
msgid "720 DPI High Quality"
-msgstr "1200 DPI high quality"
+msgstr "720 DPI High Quality"
#: src/main/escp2-resolutions.c:97
-#, fuzzy
msgid "720 DPI Highest Quality"
-msgstr "1200 DPI highest quality"
+msgstr "720 DPI Highest Quality"
#: src/main/escp2-resolutions.c:100
-#, fuzzy
msgid "720 x 720 DPI"
-msgstr "720×720 DPI"
+msgstr "720 × 720 DPI"
#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
#: src/main/escp2-resolutions.c:119
-#, fuzzy
msgid "1440 x 720 DPI"
-msgstr "1440×720 DPI"
+msgstr "1440 × 720 DPI"
#: src/main/escp2-resolutions.c:110
-#, fuzzy
msgid "1440 x 720 DPI Highest Quality"
-msgstr "1200 DPI highest quality"
+msgstr "1440 × 720 DPI Highest Quality"
#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
-#, fuzzy
msgid "1440 x 720 DPI Transposed"
-msgstr "1440×720 DPI"
+msgstr "1440 × 720 DPI Transposed"
#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
-#, fuzzy
msgid "2880 x 720 DPI"
-msgstr "2880×2880 DPI"
+msgstr "2880 × 720 DPI"
#: src/main/escp2-resolutions.c:129
-#, fuzzy
msgid "2880 x 720 DPI Highest Quality"
-msgstr "1200 DPI highest quality"
+msgstr "2880 × 720 DPI Highest Quality"
#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
#: src/main/escp2-resolutions.c:139
-#, fuzzy
msgid "1440 x 1440 DPI"
-msgstr "1440×1440 DPI DMT"
+msgstr "1440 × 1440 DPI"
#: src/main/escp2-resolutions.c:142
-#, fuzzy
msgid "1440 x 1440"
-msgstr "1440×1440 DPI DMT"
+msgstr "1440 × 1440"
#: src/main/escp2-resolutions.c:145
-#, fuzzy
msgid "1440 x 1440 DPI High Quality"
-msgstr "1200 DPI highest quality"
+msgstr "1440 × 1440 DPI High Quality"
#: src/main/escp2-resolutions.c:148
-#, fuzzy
msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1200 DPI highest quality"
+msgstr "1440 × 1440 DPI Highest Quality"
#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
#: src/main/escp2-resolutions.c:161
-#, fuzzy
msgid "2880 x 1440 DPI"
-msgstr "1440×1440 DPI DMT"
+msgstr "2880 × 1440 DPI"
#: src/main/escp2-resolutions.c:158
-#, fuzzy
msgid "2880 x 1440 DPI Transposed"
-msgstr "1440×1440 DPI DMT"
+msgstr "2880 × 1440 DPI Transposed"
#: src/main/escp2-resolutions.c:164
-#, fuzzy
msgid "2880 x 1440 DPI High Quality"
-msgstr "1200 DPI highest quality"
+msgstr "2880 × 1440 DPI High Quality"
#: src/main/escp2-resolutions.c:167
-#, fuzzy
msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1200 DPI highest quality"
+msgstr "2880 × 1440 DPI Highest Quality"
#: src/main/escp2-resolutions.c:171
-#, fuzzy
msgid "5760 x 1440 DPI"
-msgstr "1440×1440 DPI DMT"
+msgstr "5760 × 1440 DPI"
#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
-#, fuzzy
msgid "2880 x 2880 DPI"
-msgstr "2880×2880 DPI"
+msgstr "2880 × 2880 DPI"
#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
-#, fuzzy
msgid "5760 x 2880 DPI"
-msgstr "2880×2880 DPI"
+msgstr "5760 × 2880 DPI"
#: src/main/escp2-resolutions.c:548
msgid "On"
-msgstr ""
+msgstr "On"
#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
#: src/main/escp2-resolutions.c:579
-#, fuzzy
msgid "Interleave"
-msgstr "Interleave Method"
+msgstr "Interleave"
#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
#: src/main/escp2-resolutions.c:580
msgid "Full Overlap"
-msgstr ""
+msgstr "Full Overlap"
#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
#: src/main/escp2-resolutions.c:581
msgid "Four Pass"
-msgstr ""
+msgstr "Four Pass"
#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
#: src/main/escp2-resolutions.c:582
msgid "Full Overlap 2"
-msgstr ""
+msgstr "Full Overlap 2"
#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
-#, fuzzy
msgid "Interleave 2"
-msgstr "Interleave Method"
+msgstr "Interleave 2"
#: src/main/escp2-resolutions.c:584
-#, fuzzy
msgid "Eight Pass"
-msgstr "Alignment Passes"
+msgstr "Eight Pass"
#: src/main/generic-options.c:46
msgid "Text"
-msgstr ""
+msgstr "Text"
#: src/main/generic-options.c:47
msgid "Graphics"
-msgstr ""
+msgstr "Graphics"
#: src/main/generic-options.c:48
msgid "Mixed Text and Graphics"
-msgstr ""
+msgstr "Mixed Text and Graphics"
#: src/main/generic-options.c:49
-#, fuzzy
msgid "Photograph"
-msgstr "Photo Paper"
+msgstr "Photograph"
#: src/main/generic-options.c:50
msgid "Line Art"
-msgstr ""
+msgstr "Line Art"
#: src/main/generic-options.c:55
-#, fuzzy
msgid "Page"
-msgstr "Page Size"
+msgstr "Page"
#: src/main/generic-options.c:56
msgid "Job"
-msgstr ""
+msgstr "Job"
#: src/main/generic-options.c:68
-#, fuzzy
msgid "Image Type"
-msgstr "Input Image Type"
+msgstr "Image Type"
#: src/main/generic-options.c:69
-#, fuzzy
msgid "Type of image being printed"
-msgstr "Type of ink in the printer"
+msgstr "Type of image being printed"
#: src/main/generic-options.c:74 src/main/generic-options.c:80
msgid "Job Mode"
-msgstr ""
+msgstr "Job Mode"
#: src/main/generic-options.c:75
msgid "Job vs. page mode"
-msgstr ""
+msgstr "Job vs. page mode"
#: src/main/generic-options.c:80
-#, fuzzy
msgid "Page Number"
-msgstr "Page Size"
+msgstr "Page Number"
#: src/main/generic-options.c:81
-#, fuzzy
msgid "Page number"
-msgstr "Page Size"
+msgstr "Page number"
#: src/main/xmli18n-tmp.h:1
msgid "Letter"
@@ -2371,9 +2273,8 @@ msgid "4x6"
msgstr "4×6"
#: src/main/xmli18n-tmp.h:10
-#, fuzzy
msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper (tear-off borders)"
#: src/main/xmli18n-tmp.h:11
msgid "5x7"
@@ -2853,15 +2754,15 @@ msgstr "Wide Postcard"
#: src/main/xmli18n-tmp.h:131
msgid "Chilean Office"
-msgstr ""
+msgstr "Chilean Office"
#: src/main/xmli18n-tmp.h:132
msgid "Chilean Double Letter"
-msgstr ""
+msgstr "Chilean Double Letter"
#: src/main/xmli18n-tmp.h:133
msgid "Chilean Double Office"
-msgstr ""
+msgstr "Chilean Double Office"
#: src/main/xmli18n-tmp.h:134
msgid "Custom"
@@ -2912,139 +2813,112 @@ msgid "PostScript Level 2"
msgstr "PostScript Level 2"
#: src/main/xmli18n-tmp.h:146
-#, fuzzy
msgid "Canon BJ-30"
-msgstr "Canon BJC 30"
+msgstr "Canon BJ-30"
#: src/main/xmli18n-tmp.h:147
-#, fuzzy
msgid "Canon BJC-50"
-msgstr "Canon BJC 50"
+msgstr "Canon BJC-50"
#: src/main/xmli18n-tmp.h:148
-#, fuzzy
msgid "Canon BJC-55"
-msgstr "Canon BJC 55"
+msgstr "Canon BJC-55"
#: src/main/xmli18n-tmp.h:149
-#, fuzzy
msgid "Canon BJC-80"
-msgstr "Canon BJC 80"
+msgstr "Canon BJC-80"
#: src/main/xmli18n-tmp.h:150
-#, fuzzy
msgid "Canon BJC-85"
-msgstr "Canon BJC 85"
+msgstr "Canon BJC-85"
#: src/main/xmli18n-tmp.h:151
-#, fuzzy
msgid "Canon BJC-210"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-210"
#: src/main/xmli18n-tmp.h:152
-#, fuzzy
msgid "Canon BJC-240"
-msgstr "Canon BJC 240"
+msgstr "Canon BJC-240"
#: src/main/xmli18n-tmp.h:153
-#, fuzzy
msgid "Canon BJC-250"
-msgstr "Canon BJC 250"
+msgstr "Canon BJC-250"
#: src/main/xmli18n-tmp.h:154
-#, fuzzy
msgid "Canon BJC-1000"
-msgstr "Canon BJC 1000"
+msgstr "Canon BJC-1000"
#: src/main/xmli18n-tmp.h:155
-#, fuzzy
msgid "Canon BJC-2000"
-msgstr "Canon BJC 2000"
+msgstr "Canon BJC-2000"
#: src/main/xmli18n-tmp.h:156
-#, fuzzy
msgid "Canon BJC-2010"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2010"
#: src/main/xmli18n-tmp.h:157
-#, fuzzy
msgid "Canon BJC-2100"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2100"
#: src/main/xmli18n-tmp.h:158
-#, fuzzy
msgid "Canon BJC-2110"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2110"
#: src/main/xmli18n-tmp.h:159
-#, fuzzy
msgid "Canon BJC-3000"
-msgstr "Canon BJC 3000"
+msgstr "Canon BJC-3000"
#: src/main/xmli18n-tmp.h:160
-#, fuzzy
msgid "Canon BJC-4000"
-msgstr "Canon BJC 7000"
+msgstr "Canon BJC-4000"
#: src/main/xmli18n-tmp.h:161
-#, fuzzy
msgid "Canon BJC-4300"
-msgstr "Canon BJC 4300"
+msgstr "Canon BJC-4300"
#: src/main/xmli18n-tmp.h:162
-#, fuzzy
msgid "Canon BJC-4400"
-msgstr "Canon BJC 4300"
+msgstr "Canon BJC-4400"
#: src/main/xmli18n-tmp.h:163
-#, fuzzy
msgid "Canon BJC-6000"
-msgstr "Canon BJC 6000"
+msgstr "Canon BJC-6000"
#: src/main/xmli18n-tmp.h:164
-#, fuzzy
msgid "Canon BJC-6100"
-msgstr "Canon BJC 6100"
+msgstr "Canon BJC-6100"
#: src/main/xmli18n-tmp.h:165
-#, fuzzy
msgid "Canon BJC-6200"
-msgstr "Canon BJC 6200"
+msgstr "Canon BJC-6200"
#: src/main/xmli18n-tmp.h:166
-#, fuzzy
msgid "Canon BJC-6500"
-msgstr "Canon BJC 6500"
+msgstr "Canon BJC-6500"
#: src/main/xmli18n-tmp.h:167
-#, fuzzy
msgid "Canon BJC-7000"
-msgstr "Canon BJC 7000"
+msgstr "Canon BJC-7000"
#: src/main/xmli18n-tmp.h:168
-#, fuzzy
msgid "Canon BJC-7100"
-msgstr "Canon BJC 7100"
+msgstr "Canon BJC-7100"
#: src/main/xmli18n-tmp.h:169
-#, fuzzy
msgid "Canon BJC-8200"
-msgstr "Canon BJC 8200"
+msgstr "Canon BJC-8200"
#: src/main/xmli18n-tmp.h:170
-#, fuzzy
msgid "Canon S100"
-msgstr "Canon S400"
+msgstr "Canon S100"
#: src/main/xmli18n-tmp.h:171
-#, fuzzy
msgid "Canon S200"
-msgstr "Canon S400"
+msgstr "Canon S200"
#: src/main/xmli18n-tmp.h:172
-#, fuzzy
msgid "Canon S300"
-msgstr "Canon S400"
+msgstr "Canon S300"
#: src/main/xmli18n-tmp.h:173
msgid "Canon S400"
@@ -3055,19 +2929,16 @@ msgid "Canon S450"
msgstr "Canon S450"
#: src/main/xmli18n-tmp.h:175
-#, fuzzy
msgid "Canon S500"
-msgstr "Canon S4500"
+msgstr "Canon S500"
#: src/main/xmli18n-tmp.h:176
-#, fuzzy
msgid "Canon S600"
-msgstr "Canon S400"
+msgstr "Canon S600"
#: src/main/xmli18n-tmp.h:177
-#, fuzzy
msgid "Canon S630"
-msgstr "Canon S400"
+msgstr "Canon S630"
#: src/main/xmli18n-tmp.h:178
msgid "Canon S800"
@@ -3078,1226 +2949,1000 @@ msgid "Canon S4500"
msgstr "Canon S4500"
#: src/main/xmli18n-tmp.h:180
-#, fuzzy
msgid "Canon iP4000"
-msgstr "Canon S400"
+msgstr "Canon iP4000"
#: src/main/xmli18n-tmp.h:181
-#, fuzzy
msgid "Epson Stylus C20"
-msgstr "EPSON Stylus C20UX"
+msgstr "Epson Stylus C20"
#: src/main/xmli18n-tmp.h:182
-#, fuzzy
msgid "Epson Stylus C20SX"
-msgstr "EPSON Stylus C20SX"
+msgstr "Epson Stylus C20SX"
#: src/main/xmli18n-tmp.h:183
-#, fuzzy
msgid "Epson Stylus C20UX"
-msgstr "EPSON Stylus C20UX"
+msgstr "Epson Stylus C20UX"
#: src/main/xmli18n-tmp.h:184
-#, fuzzy
msgid "Epson Stylus C40"
-msgstr "EPSON Stylus C40UX"
+msgstr "Epson Stylus C40"
#: src/main/xmli18n-tmp.h:185
-#, fuzzy
msgid "Epson Stylus C40SX"
-msgstr "EPSON Stylus C40SX"
+msgstr "Epson Stylus C40SX"
#: src/main/xmli18n-tmp.h:186
-#, fuzzy
msgid "Epson Stylus C40UX"
-msgstr "EPSON Stylus C40UX"
+msgstr "Epson Stylus C40UX"
#: src/main/xmli18n-tmp.h:187
-#, fuzzy
msgid "Epson Stylus C41"
-msgstr "EPSON Stylus C41UX"
+msgstr "Epson Stylus C41"
#: src/main/xmli18n-tmp.h:188
-#, fuzzy
msgid "Epson Stylus C41SX"
-msgstr "EPSON Stylus C41SX"
+msgstr "Epson Stylus C41SX"
#: src/main/xmli18n-tmp.h:189
-#, fuzzy
msgid "Epson Stylus C41UX"
-msgstr "EPSON Stylus C41UX"
+msgstr "Epson Stylus C41UX"
#: src/main/xmli18n-tmp.h:190
-#, fuzzy
msgid "Epson Stylus C42"
-msgstr "EPSON Stylus C42UX"
+msgstr "Epson Stylus C42"
#: src/main/xmli18n-tmp.h:191
-#, fuzzy
msgid "Epson Stylus C42SX"
-msgstr "EPSON Stylus C42SX"
+msgstr "Epson Stylus C42SX"
#: src/main/xmli18n-tmp.h:192
-#, fuzzy
msgid "Epson Stylus C42UX"
-msgstr "EPSON Stylus C42UX"
+msgstr "Epson Stylus C42UX"
#: src/main/xmli18n-tmp.h:193
-#, fuzzy
msgid "Epson Stylus C43"
-msgstr "EPSON Stylus C43UX"
+msgstr "Epson Stylus C43"
#: src/main/xmli18n-tmp.h:194
-#, fuzzy
msgid "Epson Stylus C43SX"
-msgstr "EPSON Stylus C43SX"
+msgstr "Epson Stylus C43SX"
#: src/main/xmli18n-tmp.h:195
-#, fuzzy
msgid "Epson Stylus C43UX"
-msgstr "EPSON Stylus C43UX"
+msgstr "Epson Stylus C43UX"
#: src/main/xmli18n-tmp.h:196
-#, fuzzy
msgid "Epson Stylus C44"
-msgstr "EPSON Stylus C44UX"
+msgstr "Epson Stylus C44"
#: src/main/xmli18n-tmp.h:197
-#, fuzzy
msgid "Epson Stylus C44SX"
-msgstr "EPSON Stylus C44SX"
+msgstr "Epson Stylus C44SX"
#: src/main/xmli18n-tmp.h:198
-#, fuzzy
msgid "Epson Stylus C44UX"
-msgstr "EPSON Stylus C44UX"
+msgstr "Epson Stylus C44UX"
#: src/main/xmli18n-tmp.h:199
-#, fuzzy
msgid "Epson Stylus C45"
-msgstr "EPSON Stylus C45"
+msgstr "Epson Stylus C45"
#: src/main/xmli18n-tmp.h:200
-#, fuzzy
msgid "Epson Stylus C46"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus C46"
#: src/main/xmli18n-tmp.h:201
-#, fuzzy
msgid "Epson Stylus C48"
-msgstr "EPSON Stylus C45"
+msgstr "Epson Stylus C48"
#: src/main/xmli18n-tmp.h:202
-#, fuzzy
msgid "Epson Stylus C50"
-msgstr "EPSON Stylus C50"
+msgstr "Epson Stylus C50"
#: src/main/xmli18n-tmp.h:203
-#, fuzzy
msgid "Epson Stylus C60"
-msgstr "EPSON Stylus C60"
+msgstr "Epson Stylus C60"
#: src/main/xmli18n-tmp.h:204
-#, fuzzy
msgid "Epson Stylus C61"
-msgstr "EPSON Stylus C61"
+msgstr "Epson Stylus C61"
#: src/main/xmli18n-tmp.h:205
-#, fuzzy
msgid "Epson Stylus C62"
-msgstr "EPSON Stylus C62"
+msgstr "Epson Stylus C62"
#: src/main/xmli18n-tmp.h:206
-#, fuzzy
msgid "Epson Stylus C63"
-msgstr "EPSON Stylus C63"
+msgstr "Epson Stylus C63"
#: src/main/xmli18n-tmp.h:207
-#, fuzzy
msgid "Epson Stylus C64"
-msgstr "EPSON Stylus C64"
+msgstr "Epson Stylus C64"
#: src/main/xmli18n-tmp.h:208
-#, fuzzy
msgid "Epson Stylus C65"
-msgstr "EPSON Stylus C65"
+msgstr "Epson Stylus C65"
#: src/main/xmli18n-tmp.h:209
-#, fuzzy
msgid "Epson Stylus C66"
-msgstr "EPSON Stylus C66"
+msgstr "Epson Stylus C66"
#: src/main/xmli18n-tmp.h:210
-#, fuzzy
msgid "Epson Stylus C68"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus C68"
#: src/main/xmli18n-tmp.h:211
-#, fuzzy
msgid "Epson Stylus C70"
-msgstr "EPSON Stylus C70"
+msgstr "Epson Stylus C70"
#: src/main/xmli18n-tmp.h:212
-#, fuzzy
msgid "Epson Stylus C80"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus C80"
#: src/main/xmli18n-tmp.h:213
-#, fuzzy
msgid "Epson Stylus C82"
-msgstr "EPSON Stylus C82"
+msgstr "Epson Stylus C82"
#: src/main/xmli18n-tmp.h:214
-#, fuzzy
msgid "Epson Stylus C83"
-msgstr "EPSON Stylus C83"
+msgstr "Epson Stylus C83"
#: src/main/xmli18n-tmp.h:215
-#, fuzzy
msgid "Epson Stylus C84"
-msgstr "EPSON Stylus C84"
+msgstr "Epson Stylus C84"
#: src/main/xmli18n-tmp.h:216
-#, fuzzy
msgid "Epson Stylus C85"
-msgstr "EPSON Stylus C85"
+msgstr "Epson Stylus C85"
#: src/main/xmli18n-tmp.h:217
-#, fuzzy
msgid "Epson Stylus C86"
-msgstr "EPSON Stylus C86"
+msgstr "Epson Stylus C86"
#: src/main/xmli18n-tmp.h:218
-#, fuzzy
msgid "Epson Stylus C88"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus C88"
#: src/main/xmli18n-tmp.h:219
-#, fuzzy
msgid "Epson Stylus Color"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color"
#: src/main/xmli18n-tmp.h:220
-#, fuzzy
msgid "Epson Stylus Color I"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color I"
#: src/main/xmli18n-tmp.h:221
-#, fuzzy
msgid "Epson Stylus Color II"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color II"
#: src/main/xmli18n-tmp.h:222
-#, fuzzy
msgid "Epson Stylus Color IIs"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color IIs"
#: src/main/xmli18n-tmp.h:223
-#, fuzzy
msgid "Epson Stylus Color PRO"
-msgstr "EPSON Stylus Color Pro"
+msgstr "Epson Stylus Color PRO"
#: src/main/xmli18n-tmp.h:224
-#, fuzzy
msgid "Epson Stylus Pro XL"
-msgstr "EPSON Stylus Color Pro XL"
+msgstr "Epson Stylus Pro XL"
#: src/main/xmli18n-tmp.h:225
-#, fuzzy
msgid "Epson Stylus Color 400"
-msgstr "EPSON Stylus Color 400"
+msgstr "Epson Stylus Color 400"
#: src/main/xmli18n-tmp.h:226
-#, fuzzy
msgid "Epson Stylus Color 440"
-msgstr "EPSON Stylus Color 440"
+msgstr "Epson Stylus Color 440"
#: src/main/xmli18n-tmp.h:227
-#, fuzzy
msgid "Epson Stylus Color 460"
-msgstr "EPSON Stylus Color 460"
+msgstr "Epson Stylus Color 460"
#: src/main/xmli18n-tmp.h:228
-#, fuzzy
msgid "Epson Stylus Color 480"
-msgstr "EPSON Stylus Color 480"
+msgstr "Epson Stylus Color 480"
#: src/main/xmli18n-tmp.h:229
-#, fuzzy
msgid "Epson Stylus Color 500"
-msgstr "EPSON Stylus Color 500"
+msgstr "Epson Stylus Color 500"
#: src/main/xmli18n-tmp.h:230
-#, fuzzy
msgid "Epson Stylus Color 580"
-msgstr "EPSON Stylus Color 580"
+msgstr "Epson Stylus Color 580"
#: src/main/xmli18n-tmp.h:231
-#, fuzzy
msgid "Epson Stylus Color 600"
-msgstr "EPSON Stylus Color 600"
+msgstr "Epson Stylus Color 600"
#: src/main/xmli18n-tmp.h:232
-#, fuzzy
msgid "Epson Stylus Color 640"
-msgstr "EPSON Stylus Color 640"
+msgstr "Epson Stylus Color 640"
#: src/main/xmli18n-tmp.h:233
-#, fuzzy
msgid "Epson Stylus Color 660"
-msgstr "EPSON Stylus Color 660"
+msgstr "Epson Stylus Color 660"
#: src/main/xmli18n-tmp.h:234
-#, fuzzy
msgid "Epson Stylus Color 670"
-msgstr "EPSON Stylus Color 670"
+msgstr "Epson Stylus Color 670"
#: src/main/xmli18n-tmp.h:235
-#, fuzzy
msgid "Epson Stylus Color 680"
-msgstr "EPSON Stylus Color 680"
+msgstr "Epson Stylus Color 680"
#: src/main/xmli18n-tmp.h:236
-#, fuzzy
msgid "Epson Stylus Color 740"
-msgstr "EPSON Stylus Color 740"
+msgstr "Epson Stylus Color 740"
#: src/main/xmli18n-tmp.h:237
-#, fuzzy
msgid "Epson Stylus Color 760"
-msgstr "EPSON Stylus Color 760"
+msgstr "Epson Stylus Color 760"
#: src/main/xmli18n-tmp.h:238
-#, fuzzy
msgid "Epson Stylus Color 777"
-msgstr "EPSON Stylus Color 777"
+msgstr "Epson Stylus Color 777"
#: src/main/xmli18n-tmp.h:239
-#, fuzzy
msgid "Epson Stylus Color 800"
-msgstr "EPSON Stylus Color 800"
+msgstr "Epson Stylus Color 800"
#: src/main/xmli18n-tmp.h:240
-#, fuzzy
msgid "Epson Stylus Color 850"
-msgstr "EPSON Stylus Color 850"
+msgstr "Epson Stylus Color 850"
#: src/main/xmli18n-tmp.h:241
-#, fuzzy
msgid "Epson Stylus Color 860"
-msgstr "EPSON Stylus Color 860"
+msgstr "Epson Stylus Color 860"
#: src/main/xmli18n-tmp.h:242
-#, fuzzy
msgid "Epson Stylus Color 880"
-msgstr "EPSON Stylus Color 880"
+msgstr "Epson Stylus Color 880"
#: src/main/xmli18n-tmp.h:243
-#, fuzzy
msgid "Epson Stylus Color 8 3"
-msgstr "EPSON Stylus Color 83"
+msgstr "Epson Stylus Color 8 3"
#: src/main/xmli18n-tmp.h:244
-#, fuzzy
msgid "Epson Stylus Color 900"
-msgstr "EPSON Stylus Color 900"
+msgstr "Epson Stylus Color 900"
#: src/main/xmli18n-tmp.h:245
-#, fuzzy
msgid "Epson Stylus Color 980"
-msgstr "EPSON Stylus Color 980"
+msgstr "Epson Stylus Color 980"
#: src/main/xmli18n-tmp.h:246
-#, fuzzy
msgid "Epson Stylus Color 1160"
-msgstr "EPSON Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
#: src/main/xmli18n-tmp.h:247
-#, fuzzy
msgid "Epson Stylus Color 1500"
-msgstr "EPSON Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
#: src/main/xmli18n-tmp.h:248
-#, fuzzy
msgid "Epson Stylus Color 1520"
-msgstr "EPSON Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
#: src/main/xmli18n-tmp.h:249
-#, fuzzy
msgid "Epson Stylus Color 3000"
-msgstr "EPSON Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
#: src/main/xmli18n-tmp.h:250
-#, fuzzy
msgid "Epson Stylus Photo"
-msgstr "EPSON Stylus Photo"
+msgstr "Epson Stylus Photo"
#: src/main/xmli18n-tmp.h:251
-#, fuzzy
msgid "Epson Stylus Photo 700"
-msgstr "EPSON Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
#: src/main/xmli18n-tmp.h:252
-#, fuzzy
msgid "Epson Stylus Photo EX"
-msgstr "EPSON Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
#: src/main/xmli18n-tmp.h:253
-#, fuzzy
msgid "Epson Stylus Photo EX3"
-msgstr "EPSON Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
#: src/main/xmli18n-tmp.h:254
-#, fuzzy
msgid "Epson Stylus Photo 720"
-msgstr "EPSON Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
#: src/main/xmli18n-tmp.h:255
-#, fuzzy
msgid "Epson Stylus Photo 750"
-msgstr "EPSON Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
#: src/main/xmli18n-tmp.h:256
-#, fuzzy
msgid "Epson Stylus Photo 780"
-msgstr "EPSON Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
#: src/main/xmli18n-tmp.h:257
-#, fuzzy
msgid "Epson Stylus Photo 785"
-msgstr "EPSON Stylus Photo 895"
+msgstr "Epson Stylus Photo 785"
#: src/main/xmli18n-tmp.h:258
-#, fuzzy
msgid "Epson Stylus Photo 790"
-msgstr "EPSON Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
#: src/main/xmli18n-tmp.h:259
-#, fuzzy
msgid "Epson Stylus Photo 810"
-msgstr "EPSON Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
#: src/main/xmli18n-tmp.h:260
-#, fuzzy
msgid "Epson Stylus Photo 820"
-msgstr "EPSON Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
#: src/main/xmli18n-tmp.h:261
-#, fuzzy
msgid "Epson Stylus Photo 825"
-msgstr "EPSON Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
#: src/main/xmli18n-tmp.h:262
-#, fuzzy
msgid "Epson Stylus Photo 830"
-msgstr "EPSON Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
#: src/main/xmli18n-tmp.h:263
-#, fuzzy
msgid "Epson Stylus Photo 830U"
-msgstr "EPSON Stylus Photo 830"
+msgstr "Epson Stylus Photo 830U"
#: src/main/xmli18n-tmp.h:264
-#, fuzzy
msgid "Epson Stylus Photo 870"
-msgstr "EPSON Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
#: src/main/xmli18n-tmp.h:265
-#, fuzzy
msgid "Epson Stylus Photo 875"
-msgstr "EPSON Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
#: src/main/xmli18n-tmp.h:266
-#, fuzzy
msgid "Epson Stylus Photo 890"
-msgstr "EPSON Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
#: src/main/xmli18n-tmp.h:267
-#, fuzzy
msgid "Epson Stylus Photo 895"
-msgstr "EPSON Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
#: src/main/xmli18n-tmp.h:268
-#, fuzzy
msgid "Epson Stylus Photo 900"
-msgstr "EPSON Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
#: src/main/xmli18n-tmp.h:269
-#, fuzzy
msgid "Epson Stylus Photo 915"
-msgstr "EPSON Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
#: src/main/xmli18n-tmp.h:270
-#, fuzzy
msgid "Epson Stylus Photo 925"
-msgstr "EPSON Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
#: src/main/xmli18n-tmp.h:271
-#, fuzzy
msgid "Epson Stylus Photo 935"
-msgstr "EPSON Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
#: src/main/xmli18n-tmp.h:272
-#, fuzzy
msgid "Epson Stylus Photo 950"
-msgstr "EPSON Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
#: src/main/xmli18n-tmp.h:273
-#, fuzzy
msgid "Epson Stylus Photo 960"
-msgstr "EPSON Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
#: src/main/xmli18n-tmp.h:274
-#, fuzzy
msgid "Epson Stylus Photo 1200"
-msgstr "EPSON Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
#: src/main/xmli18n-tmp.h:275
-#, fuzzy
msgid "Epson Stylus Photo 1270"
-msgstr "EPSON Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
#: src/main/xmli18n-tmp.h:276
-#, fuzzy
msgid "Epson Stylus Photo 1280"
-msgstr "EPSON Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
#: src/main/xmli18n-tmp.h:277
-#, fuzzy
msgid "Epson Stylus Photo 1290"
-msgstr "EPSON Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
#: src/main/xmli18n-tmp.h:278
-#, fuzzy
msgid "Epson Stylus Photo 2000P"
-msgstr "EPSON Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
#: src/main/xmli18n-tmp.h:279
-#, fuzzy
msgid "Epson Stylus Photo 2100"
-msgstr "EPSON Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
#: src/main/xmli18n-tmp.h:280
-#, fuzzy
msgid "Epson Stylus Photo 2200"
-msgstr "EPSON Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
#: src/main/xmli18n-tmp.h:281
-#, fuzzy
msgid "Epson Stylus Photo R200"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
#: src/main/xmli18n-tmp.h:282
-#, fuzzy
msgid "Epson Stylus Photo R210"
-msgstr "EPSON Stylus Photo 2100"
+msgstr "Epson Stylus Photo R210"
#: src/main/xmli18n-tmp.h:283
-#, fuzzy
msgid "Epson Stylus Photo R220"
-msgstr "EPSON Stylus Photo 2200"
+msgstr "Epson Stylus Photo R220"
#: src/main/xmli18n-tmp.h:284
-#, fuzzy
msgid "Epson Stylus Photo R300"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
#: src/main/xmli18n-tmp.h:285
-#, fuzzy
msgid "Epson Stylus Photo R310"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo R310"
#: src/main/xmli18n-tmp.h:286
-#, fuzzy
msgid "Epson Stylus Photo R320"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R320"
#: src/main/xmli18n-tmp.h:287
-#, fuzzy
msgid "Epson Stylus Photo R340"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo R340"
#: src/main/xmli18n-tmp.h:288
-#, fuzzy
msgid "Epson Stylus Photo RX400"
-msgstr "EPSON Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX400"
#: src/main/xmli18n-tmp.h:289
-#, fuzzy
msgid "Epson Stylus Photo RX420"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo RX420"
#: src/main/xmli18n-tmp.h:290
-#, fuzzy
msgid "Epson Stylus Photo RX425"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo RX425"
#: src/main/xmli18n-tmp.h:291
-#, fuzzy
msgid "Epson Stylus Photo RX430"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo RX430"
#: src/main/xmli18n-tmp.h:292
-#, fuzzy
msgid "Epson Stylus Photo RX500"
-msgstr "EPSON Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
#: src/main/xmli18n-tmp.h:293
-#, fuzzy
msgid "Epson Stylus Photo RX510"
-msgstr "EPSON Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX510"
#: src/main/xmli18n-tmp.h:294
-#, fuzzy
msgid "Epson Stylus Photo RX600"
-msgstr "EPSON Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
#: src/main/xmli18n-tmp.h:295
-#, fuzzy
msgid "Epson Stylus Photo RX620"
-msgstr "EPSON Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX620"
#: src/main/xmli18n-tmp.h:296
-#, fuzzy
msgid "Epson Stylus Photo RX630"
-msgstr "EPSON Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX630"
#: src/main/xmli18n-tmp.h:297
-#, fuzzy
msgid "Epson Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX700"
#: src/main/xmli18n-tmp.h:298
-#, fuzzy
msgid "Epson Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
#: src/main/xmli18n-tmp.h:299
-#, fuzzy
msgid "Epson Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R800"
+msgstr "Epson Stylus Photo R1800"
#: src/main/xmli18n-tmp.h:300
-#, fuzzy
msgid "Epson Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R2400"
#: src/main/xmli18n-tmp.h:301
-#, fuzzy
msgid "Epson Stylus Pro 5000"
-msgstr "EPSON Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
#: src/main/xmli18n-tmp.h:302
-#, fuzzy
msgid "Epson Stylus Pro 5500"
-msgstr "EPSON Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
#: src/main/xmli18n-tmp.h:303
-#, fuzzy
msgid "Epson Stylus Pro 7000"
-msgstr "EPSON Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
#: src/main/xmli18n-tmp.h:304
-#, fuzzy
msgid "Epson Stylus Pro 7500"
-msgstr "EPSON Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
#: src/main/xmli18n-tmp.h:305
-#, fuzzy
msgid "Epson Stylus Pro 7600"
-msgstr "EPSON Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
#: src/main/xmli18n-tmp.h:306
-#, fuzzy
msgid "Epson Stylus Pro 9000"
-msgstr "EPSON Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
#: src/main/xmli18n-tmp.h:307
-#, fuzzy
msgid "Epson Stylus Pro 9500"
-msgstr "EPSON Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
#: src/main/xmli18n-tmp.h:308
-#, fuzzy
msgid "Epson Stylus Pro 9600"
-msgstr "EPSON Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
#: src/main/xmli18n-tmp.h:309
-#, fuzzy
msgid "Epson Stylus Pro 10000"
-msgstr "EPSON Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
#: src/main/xmli18n-tmp.h:310
-#, fuzzy
msgid "Epson Stylus Scan 2000"
-msgstr "EPSON Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
#: src/main/xmli18n-tmp.h:311
-#, fuzzy
msgid "Epson Stylus Scan 2500"
-msgstr "EPSON Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
#: src/main/xmli18n-tmp.h:312
-#, fuzzy
msgid "Epson Stylus CX1500"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus CX1500"
#: src/main/xmli18n-tmp.h:313
-#, fuzzy
msgid "Epson Stylus CX3100"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus CX3100"
#: src/main/xmli18n-tmp.h:314
-#, fuzzy
msgid "Epson Stylus CX3200"
-msgstr "EPSON Stylus CX-3200"
+msgstr "Epson Stylus CX3200"
#: src/main/xmli18n-tmp.h:315
-#, fuzzy
msgid "Epson Stylus CX3500"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus CX3500"
#: src/main/xmli18n-tmp.h:316
-#, fuzzy
msgid "Epson Stylus CX3600"
-msgstr "EPSON Stylus CX-8300"
+msgstr "Epson Stylus CX3600"
#: src/main/xmli18n-tmp.h:317
-#, fuzzy
msgid "Epson Stylus CX3650"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus CX3650"
#: src/main/xmli18n-tmp.h:318
-#, fuzzy
msgid "Epson Stylus CX3700"
-msgstr "EPSON Stylus CX-8300"
+msgstr "Epson Stylus CX3700"
#: src/main/xmli18n-tmp.h:319
-#, fuzzy
msgid "Epson Stylus CX3800"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX3800"
#: src/main/xmli18n-tmp.h:320
-#, fuzzy
msgid "Epson Stylus CX3805"
-msgstr "EPSON Stylus C85"
+msgstr "Epson Stylus CX3805"
#: src/main/xmli18n-tmp.h:321
-#, fuzzy
msgid "Epson Stylus CX3810"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus CX3810"
#: src/main/xmli18n-tmp.h:322
-#, fuzzy
msgid "Epson Stylus CX4100"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX4100"
#: src/main/xmli18n-tmp.h:323
-#, fuzzy
msgid "Epson Stylus CX4200"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX4200"
#: src/main/xmli18n-tmp.h:324
-#, fuzzy
msgid "Epson Stylus CX4500"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX4500"
#: src/main/xmli18n-tmp.h:325
-#, fuzzy
msgid "Epson Stylus CX4600"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX4600"
#: src/main/xmli18n-tmp.h:326
-#, fuzzy
msgid "Epson Stylus CX4700"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX4700"
#: src/main/xmli18n-tmp.h:327
-#, fuzzy
msgid "Epson Stylus CX4800"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX4800"
#: src/main/xmli18n-tmp.h:328
-#, fuzzy
msgid "Epson Stylus CX5100"
-msgstr "EPSON Stylus CX-5100"
+msgstr "Epson Stylus CX5100"
#: src/main/xmli18n-tmp.h:329
-#, fuzzy
msgid "Epson Stylus CX5200"
-msgstr "EPSON Stylus CX-5200"
+msgstr "Epson Stylus CX5200"
#: src/main/xmli18n-tmp.h:330
-#, fuzzy
msgid "Epson Stylus CX5300"
-msgstr "EPSON Stylus CX-5300"
+msgstr "Epson Stylus CX5300"
#: src/main/xmli18n-tmp.h:331
-#, fuzzy
msgid "Epson Stylus CX5400"
-msgstr "EPSON Stylus CX-5400"
+msgstr "Epson Stylus CX5400"
#: src/main/xmli18n-tmp.h:332
-#, fuzzy
msgid "Epson Stylus CX5700"
-msgstr "EPSON Stylus CX-8300"
+msgstr "Epson Stylus CX5700"
#: src/main/xmli18n-tmp.h:333
-#, fuzzy
msgid "Epson Stylus CX5800"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX5800"
#: src/main/xmli18n-tmp.h:334
-#, fuzzy
msgid "Epson Stylus CX6300"
-msgstr "EPSON Stylus CX-6300"
+msgstr "Epson Stylus CX6300"
#: src/main/xmli18n-tmp.h:335
-#, fuzzy
msgid "Epson Stylus CX6400"
-msgstr "EPSON Stylus CX-6400"
+msgstr "Epson Stylus CX6400"
#: src/main/xmli18n-tmp.h:336
-#, fuzzy
msgid "Epson Stylus CX6500"
-msgstr "EPSON Stylus CX-8300"
+msgstr "Epson Stylus CX6500"
#: src/main/xmli18n-tmp.h:337
-#, fuzzy
msgid "Epson Stylus CX6600"
-msgstr "EPSON Stylus CX-6600"
+msgstr "Epson Stylus CX6600"
#: src/main/xmli18n-tmp.h:338
-#, fuzzy
msgid "Epson Stylus CX7700"
-msgstr "EPSON Stylus C70"
+msgstr "Epson Stylus CX7700"
#: src/main/xmli18n-tmp.h:339
-#, fuzzy
msgid "Epson Stylus CX7800"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX7800"
#: src/main/xmli18n-tmp.h:340
-#, fuzzy
msgid "Epson Stylus CX8300"
-msgstr "EPSON Stylus CX-8300"
+msgstr "Epson Stylus CX8300"
#: src/main/xmli18n-tmp.h:341
-#, fuzzy
msgid "Epson Stylus CX8400"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus CX8400"
#: src/main/xmli18n-tmp.h:342
-#, fuzzy
msgid "Epson Stylus D68"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus D68"
#: src/main/xmli18n-tmp.h:343
-#, fuzzy
msgid "Epson Stylus D88"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus D88"
#: src/main/xmli18n-tmp.h:344
-#, fuzzy
msgid "Epson Stylus DX3800"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus DX3800"
#: src/main/xmli18n-tmp.h:345
-#, fuzzy
msgid "Epson Stylus DX3850"
-msgstr "EPSON Stylus CX-3100"
+msgstr "Epson Stylus DX3850"
#: src/main/xmli18n-tmp.h:346
-#, fuzzy
msgid "Epson Stylus DX4200"
-msgstr "EPSON Stylus CX-3200"
+msgstr "Epson Stylus DX4200"
#: src/main/xmli18n-tmp.h:347
-#, fuzzy
msgid "Epson Stylus DX4250"
-msgstr "EPSON Stylus C50"
+msgstr "Epson Stylus DX4250"
#: src/main/xmli18n-tmp.h:348
-#, fuzzy
msgid "Epson Stylus DX4800"
-msgstr "EPSON Stylus CX-8400"
+msgstr "Epson Stylus DX4800"
#: src/main/xmli18n-tmp.h:349
msgid "Epson PictureMate"
-msgstr ""
+msgstr "Epson PictureMate"
#: src/main/xmli18n-tmp.h:350
msgid "Epson PictureMate Deluxe"
-msgstr ""
+msgstr "Epson PictureMate Deluxe"
#: src/main/xmli18n-tmp.h:351
-#, fuzzy
msgid "Epson CL 700"
-msgstr "Canon BJC 7000"
+msgstr "Epson CL 700"
#: src/main/xmli18n-tmp.h:352
msgid "Epson CL 750"
-msgstr ""
+msgstr "Epson CL 750"
#: src/main/xmli18n-tmp.h:353
msgid "Epson CL 760"
-msgstr ""
+msgstr "Epson CL 760"
#: src/main/xmli18n-tmp.h:354
msgid "Epson E 100"
-msgstr ""
+msgstr "Epson E 100"
#: src/main/xmli18n-tmp.h:355
msgid "Epson E 150"
-msgstr ""
+msgstr "Epson E 150"
#: src/main/xmli18n-tmp.h:356
msgid "Epson E 200"
-msgstr ""
+msgstr "Epson E 200"
#: src/main/xmli18n-tmp.h:357
-#, fuzzy
msgid "Epson EM 900C"
-msgstr "EPSON EM-900C"
+msgstr "Epson EM 900C"
#: src/main/xmli18n-tmp.h:358
-#, fuzzy
msgid "Epson EM 930C"
-msgstr "EPSON EM-930C"
+msgstr "Epson EM 930C"
#: src/main/xmli18n-tmp.h:359
-#, fuzzy
msgid "Epson MC 2000"
-msgstr "Canon BJC 2000"
+msgstr "Epson MC 2000"
#: src/main/xmli18n-tmp.h:360
-#, fuzzy
msgid "Epson MC 5000"
-msgstr "EPSON MC-5000"
+msgstr "Epson MC 5000"
#: src/main/xmli18n-tmp.h:361
-#, fuzzy
msgid "Epson MC 7000"
-msgstr "Canon BJC 7000"
+msgstr "Epson MC 7000"
#: src/main/xmli18n-tmp.h:362
-#, fuzzy
msgid "Epson MC 9000"
-msgstr "EPSON MC-9000"
+msgstr "Epson MC 9000"
#: src/main/xmli18n-tmp.h:363
-#, fuzzy
msgid "Epson MC 10000"
-msgstr "Canon BJC 1000"
+msgstr "Epson MC 10000"
#: src/main/xmli18n-tmp.h:364
-#, fuzzy
msgid "Epson MJ 930C"
-msgstr "EPSON MJ-930C"
+msgstr "Epson MJ 930C"
#: src/main/xmli18n-tmp.h:365
-#, fuzzy
msgid "Epson MJ 5100C"
-msgstr "EPSON MJ-5100C"
+msgstr "Epson MJ 5100C"
#: src/main/xmli18n-tmp.h:366
-#, fuzzy
msgid "Epson MJ 6000C"
-msgstr "Canon BJC 6000"
+msgstr "Epson MJ 6000C"
#: src/main/xmli18n-tmp.h:367
-#, fuzzy
msgid "Epson MJ 8000C"
-msgstr "EPSON MJ-8000C"
+msgstr "Epson MJ 8000C"
#: src/main/xmli18n-tmp.h:368
-#, fuzzy
msgid "Epson PM 700C"
-msgstr "EPSON PM-700C"
+msgstr "Epson PM 700C"
#: src/main/xmli18n-tmp.h:369
-#, fuzzy
msgid "Epson PM 730C"
-msgstr "EPSON PM-730C"
+msgstr "Epson PM 730C"
#: src/main/xmli18n-tmp.h:370
-#, fuzzy
msgid "Epson PM 740C"
-msgstr "EPSON PM-740C"
+msgstr "Epson PM 740C"
#: src/main/xmli18n-tmp.h:371
-#, fuzzy
msgid "Epson PM 750C"
-msgstr "EPSON PM-750C"
+msgstr "Epson PM 750C"
#: src/main/xmli18n-tmp.h:372
-#, fuzzy
msgid "Epson PM 760C"
-msgstr "EPSON PM-760C"
+msgstr "Epson PM 760C"
#: src/main/xmli18n-tmp.h:373
-#, fuzzy
msgid "Epson PM 770C"
-msgstr "EPSON PM-770C"
+msgstr "Epson PM 770C"
#: src/main/xmli18n-tmp.h:374
-#, fuzzy
msgid "Epson PM 780C"
-msgstr "EPSON PM-780C"
+msgstr "Epson PM 780C"
#: src/main/xmli18n-tmp.h:375
-#, fuzzy
msgid "Epson PM 790PT"
-msgstr "EPSON PM-790PT"
+msgstr "Epson PM 790PT"
#: src/main/xmli18n-tmp.h:376
-#, fuzzy
msgid "Epson PM 800C"
-msgstr "EPSON PM-800C"
+msgstr "Epson PM 800C"
#: src/main/xmli18n-tmp.h:377
-#, fuzzy
msgid "Epson PM 850PT"
-msgstr "EPSON PM-850PT"
+msgstr "Epson PM 850PT"
#: src/main/xmli18n-tmp.h:378
-#, fuzzy
msgid "Epson PM 870C"
-msgstr "EPSON PM-870C"
+msgstr "Epson PM 870C"
#: src/main/xmli18n-tmp.h:379
-#, fuzzy
msgid "Epson PM 880C"
-msgstr "EPSON PM-880C"
+msgstr "Epson PM 880C"
#: src/main/xmli18n-tmp.h:380
-#, fuzzy
msgid "Epson PM 930C"
-msgstr "EPSON PM-930C"
+msgstr "Epson PM 930C"
#: src/main/xmli18n-tmp.h:381
-#, fuzzy
msgid "Epson PM 940C"
-msgstr "EPSON PM-940C"
+msgstr "Epson PM 940C"
#: src/main/xmli18n-tmp.h:382
-#, fuzzy
msgid "Epson PM 950C"
-msgstr "EPSON PM-950C"
+msgstr "Epson PM 950C"
#: src/main/xmli18n-tmp.h:383
-#, fuzzy
msgid "Epson PM 970C"
-msgstr "EPSON PM-970C"
+msgstr "Epson PM 970C"
#: src/main/xmli18n-tmp.h:384
-#, fuzzy
msgid "Epson PM 980C"
-msgstr "EPSON PM-980C"
+msgstr "Epson PM 980C"
#: src/main/xmli18n-tmp.h:385
-#, fuzzy
msgid "Epson PM 2000C"
-msgstr "EPSON PM-2000C"
+msgstr "Epson PM 2000C"
#: src/main/xmli18n-tmp.h:386
-#, fuzzy
msgid "Epson PM 2200C"
-msgstr "EPSON PM-2200C"
+msgstr "Epson PM 2200C"
#: src/main/xmli18n-tmp.h:387
-#, fuzzy
msgid "Epson PM 3000C"
-msgstr "EPSON PM-3000C"
+msgstr "Epson PM 3000C"
#: src/main/xmli18n-tmp.h:388
-#, fuzzy
msgid "Epson PM 3300C"
-msgstr "EPSON PM-3300C"
+msgstr "Epson PM 3300C"
#: src/main/xmli18n-tmp.h:389
-#, fuzzy
msgid "Epson PM 3500C"
-msgstr "EPSON PM-3500C"
+msgstr "Epson PM 3500C"
#: src/main/xmli18n-tmp.h:390
-#, fuzzy
msgid "Epson PM 3700C"
-msgstr "EPSON PM-3700C"
+msgstr "Epson PM 3700C"
#: src/main/xmli18n-tmp.h:391
-#, fuzzy
msgid "Epson PM 4000PX"
-msgstr "EPSON PM-4000PX"
+msgstr "Epson PM 4000PX"
#: src/main/xmli18n-tmp.h:392
-#, fuzzy
msgid "Epson PM 5000C"
-msgstr "EPSON PM-5000C"
+msgstr "Epson PM 5000C"
#: src/main/xmli18n-tmp.h:393
-#, fuzzy
msgid "Epson PM 7000C"
-msgstr "EPSON PM-7000C"
+msgstr "Epson PM 7000C"
#: src/main/xmli18n-tmp.h:394
-#, fuzzy
msgid "Epson PM 9000C"
-msgstr "EPSON PM-9000C"
+msgstr "Epson PM 9000C"
#: src/main/xmli18n-tmp.h:395
-#, fuzzy
msgid "Epson PM 10000"
-msgstr "EPSON PM-10000"
+msgstr "Epson PM 10000"
#: src/main/xmli18n-tmp.h:396
msgid "Epson PM A650"
-msgstr ""
+msgstr "Epson PM A650"
#: src/main/xmli18n-tmp.h:397
msgid "Epson PM A750"
-msgstr ""
+msgstr "Epson PM A750"
#: src/main/xmli18n-tmp.h:398
msgid "Epson PM A890"
-msgstr ""
+msgstr "Epson PM A890"
#: src/main/xmli18n-tmp.h:399
-#, fuzzy
msgid "Epson PM A900"
-msgstr "EPSON PM-9000C"
+msgstr "Epson PM A900"
#: src/main/xmli18n-tmp.h:400
msgid "Epson PM A950"
-msgstr ""
+msgstr "Epson PM A950"
#: src/main/xmli18n-tmp.h:401
msgid "Epson PM D600"
-msgstr ""
+msgstr "Epson PM D600"
#: src/main/xmli18n-tmp.h:402
-#, fuzzy
msgid "Epson PM D750"
-msgstr "EPSON PM-D750"
+msgstr "Epson PM D750"
#: src/main/xmli18n-tmp.h:403
-#, fuzzy
msgid "Epson PM D770"
-msgstr "EPSON PM-770C"
+msgstr "Epson PM D770"
#: src/main/xmli18n-tmp.h:404
msgid "Epson PM D800"
-msgstr ""
+msgstr "Epson PM D800"
#: src/main/xmli18n-tmp.h:405
-#, fuzzy
msgid "Epson PM D1000"
-msgstr "EPSON PM-10000"
+msgstr "Epson PM D1000"
#: src/main/xmli18n-tmp.h:406
-#, fuzzy
msgid "Epson PM G700"
-msgstr "EPSON PM-G700"
+msgstr "Epson PM G700"
#: src/main/xmli18n-tmp.h:407
-#, fuzzy
msgid "Epson PM G720"
-msgstr "EPSON PM-G700"
+msgstr "Epson PM G720"
#: src/main/xmli18n-tmp.h:408
msgid "Epson PM G730"
-msgstr ""
+msgstr "Epson PM G730"
#: src/main/xmli18n-tmp.h:409
-#, fuzzy
msgid "Epson PM G800"
-msgstr "EPSON PM-G800"
+msgstr "Epson PM G800"
#: src/main/xmli18n-tmp.h:410
-#, fuzzy
msgid "Epson PM G820"
-msgstr "EPSON PM-G800"
+msgstr "Epson PM G820"
#: src/main/xmli18n-tmp.h:411
-#, fuzzy
msgid "Epson PX A650"
-msgstr "EPSON PX-V600"
+msgstr "Epson PX A650"
#: src/main/xmli18n-tmp.h:412
-#, fuzzy
msgid "Epson PX G900"
-msgstr "EPSON PX-9000"
+msgstr "Epson PX G900"
#: src/main/xmli18n-tmp.h:413
-#, fuzzy
msgid "Epson PX G920"
-msgstr "EPSON PX-9000"
+msgstr "Epson PX G920"
#: src/main/xmli18n-tmp.h:414
-#, fuzzy
msgid "Epson PX G5000"
-msgstr "EPSON PX-9000"
+msgstr "Epson PX G5000"
#: src/main/xmli18n-tmp.h:415
-#, fuzzy
msgid "Epson PX V500"
-msgstr "EPSON PX-V500"
+msgstr "Epson PX V500"
#: src/main/xmli18n-tmp.h:416
-#, fuzzy
msgid "Epson PX V600"
-msgstr "EPSON PX-V600"
+msgstr "Epson PX V600"
#: src/main/xmli18n-tmp.h:417
msgid "Epson PX V630"
-msgstr ""
+msgstr "Epson PX V630"
#: src/main/xmli18n-tmp.h:418
-#, fuzzy
msgid "Epson PX 5500"
-msgstr "EPSON PX-V500"
+msgstr "Epson PX 5500"
#: src/main/xmli18n-tmp.h:419
-#, fuzzy
msgid "Epson PX 7000"
-msgstr "EPSON PX-7000"
+msgstr "Epson PX 7000"
#: src/main/xmli18n-tmp.h:420
-#, fuzzy
msgid "Epson PX 9000"
-msgstr "EPSON PX-9000"
+msgstr "Epson PX 9000"
#: src/main/xmli18n-tmp.h:421
msgid "Apollo P-2100"
-msgstr ""
+msgstr "Apollo P-2100"
#: src/main/xmli18n-tmp.h:422
msgid "Apollo P-2150"
-msgstr ""
+msgstr "Apollo P-2150"
#: src/main/xmli18n-tmp.h:423
msgid "Apollo P-2200"
-msgstr ""
+msgstr "Apollo P-2200"
#: src/main/xmli18n-tmp.h:424
msgid "Apollo P-2250"
-msgstr ""
+msgstr "Apollo P-2250"
#: src/main/xmli18n-tmp.h:425
msgid "Apollo P-2500"
-msgstr ""
+msgstr "Apollo P-2500"
#: src/main/xmli18n-tmp.h:426
msgid "Apollo P-2550"
-msgstr ""
+msgstr "Apollo P-2550"
#: src/main/xmli18n-tmp.h:427
msgid "Apollo P-2600"
-msgstr ""
+msgstr "Apollo P-2600"
#: src/main/xmli18n-tmp.h:428
msgid "Apollo P-2650"
-msgstr ""
+msgstr "Apollo P-2650"
#: src/main/xmli18n-tmp.h:429
msgid "Apple Color StyleWriter 4100"
@@ -4313,333 +3958,311 @@ msgstr "Apple Colour StyleWriter 6500"
#: src/main/xmli18n-tmp.h:432
msgid "Apple LaserWriter Select 360"
-msgstr ""
+msgstr "Apple LaserWriter Select 360"
#: src/main/xmli18n-tmp.h:433
msgid "Brother DCP-1200"
-msgstr ""
+msgstr "Brother DCP-1200"
#: src/main/xmli18n-tmp.h:434
msgid "Brother HL-4Ve"
-msgstr ""
+msgstr "Brother HL-4Ve"
#: src/main/xmli18n-tmp.h:435
msgid "Brother HL-10V"
-msgstr ""
+msgstr "Brother HL-10V"
#: src/main/xmli18n-tmp.h:436
msgid "Brother HL-10h"
-msgstr ""
+msgstr "Brother HL-10h"
#: src/main/xmli18n-tmp.h:437
msgid "Brother HL-630"
-msgstr ""
+msgstr "Brother HL-630"
#: src/main/xmli18n-tmp.h:438
msgid "Brother HL-660"
-msgstr ""
+msgstr "Brother HL-660"
#: src/main/xmli18n-tmp.h:439
msgid "Brother HL-760"
-msgstr ""
+msgstr "Brother HL-760"
#: src/main/xmli18n-tmp.h:440
msgid "Brother HL-960"
-msgstr ""
+msgstr "Brother HL-960"
#: src/main/xmli18n-tmp.h:441
msgid "Brother HL-1040"
-msgstr ""
+msgstr "Brother HL-1040"
#: src/main/xmli18n-tmp.h:442
msgid "Brother HL-1050"
-msgstr ""
+msgstr "Brother HL-1050"
#: src/main/xmli18n-tmp.h:443
msgid "Brother HL-1060"
-msgstr ""
+msgstr "Brother HL-1060"
#: src/main/xmli18n-tmp.h:444
msgid "Brother HL-1070"
-msgstr ""
+msgstr "Brother HL-1070"
#: src/main/xmli18n-tmp.h:445
msgid "Brother HL-1240"
-msgstr ""
+msgstr "Brother HL-1240"
#: src/main/xmli18n-tmp.h:446
msgid "Brother HL-1250"
-msgstr ""
+msgstr "Brother HL-1250"
#: src/main/xmli18n-tmp.h:447
msgid "Brother HL-1260"
-msgstr ""
+msgstr "Brother HL-1260"
#: src/main/xmli18n-tmp.h:448
msgid "Brother HL-1270N"
-msgstr ""
+msgstr "Brother HL-1270N"
#: src/main/xmli18n-tmp.h:449
msgid "Brother HL-1440"
-msgstr ""
+msgstr "Brother HL-1440"
#: src/main/xmli18n-tmp.h:450
msgid "Brother HL-1660e"
-msgstr ""
+msgstr "Brother HL-1660e"
#: src/main/xmli18n-tmp.h:451
msgid "Brother HL-2060"
-msgstr ""
+msgstr "Brother HL-2060"
#: src/main/xmli18n-tmp.h:452
msgid "Brother MFC-6550MC"
-msgstr ""
+msgstr "Brother MFC-6550MC"
#: src/main/xmli18n-tmp.h:453
msgid "Brother MFC-8300"
-msgstr ""
+msgstr "Brother MFC-8300"
#: src/main/xmli18n-tmp.h:454
msgid "Brother MFC-9500"
-msgstr ""
+msgstr "Brother MFC-9500"
#: src/main/xmli18n-tmp.h:455
msgid "Brother MFC-9600"
-msgstr ""
+msgstr "Brother MFC-9600"
#: src/main/xmli18n-tmp.h:456
-#, fuzzy
msgid "Canon GP 335"
-msgstr "Canon BJC 85"
+msgstr "Canon GP 335"
#: src/main/xmli18n-tmp.h:457
-#, fuzzy
msgid "Canon LBP-4sx"
-msgstr "Canon BJC 240"
+msgstr "Canon LBP-4sx"
#: src/main/xmli18n-tmp.h:458
-#, fuzzy
msgid "Canon LBP-430"
-msgstr "Canon BJC 4300"
+msgstr "Canon LBP-430"
#: src/main/xmli18n-tmp.h:459
-#, fuzzy
msgid "Canon LBP-1000"
-msgstr "Canon CP100"
+msgstr "Canon LBP-1000"
#: src/main/xmli18n-tmp.h:460
-#, fuzzy
msgid "Canon LBP-1260"
-msgstr "Canon CP220"
+msgstr "Canon LBP-1260"
#: src/main/xmli18n-tmp.h:461
-#, fuzzy
msgid "Canon LBP-1760"
-msgstr "Canon CP100"
+msgstr "Canon LBP-1760"
#: src/main/xmli18n-tmp.h:462
msgid "Canon imageRunner 330s"
-msgstr ""
+msgstr "Canon imageRunner 330s"
#: src/main/xmli18n-tmp.h:463
msgid "Citizen ProJet II"
-msgstr ""
+msgstr "Citizen ProJet II"
#: src/main/xmli18n-tmp.h:464
msgid "DEC 1800"
-msgstr ""
+msgstr "DEC 1800"
#: src/main/xmli18n-tmp.h:465
msgid "DEC LN17"
-msgstr ""
+msgstr "DEC LN17"
#: src/main/xmli18n-tmp.h:466
msgid "Epson ActionLaser 1100"
-msgstr ""
+msgstr "Epson ActionLaser 1100"
#: src/main/xmli18n-tmp.h:467
msgid "Epson ActionLaser II"
-msgstr ""
+msgstr "Epson ActionLaser II"
#: src/main/xmli18n-tmp.h:468
msgid "Epson AcuLaser C2000"
-msgstr ""
+msgstr "Epson AcuLaser C2000"
#: src/main/xmli18n-tmp.h:469
msgid "Epson AcuLaser C2000PS"
-msgstr ""
+msgstr "Epson AcuLaser C2000PS"
#: src/main/xmli18n-tmp.h:470
msgid "Epson AcuLaser C8500"
-msgstr ""
+msgstr "Epson AcuLaser C8500"
#: src/main/xmli18n-tmp.h:471
msgid "Epson AcuLaser C8500PS"
-msgstr ""
+msgstr "Epson AcuLaser C8500PS"
#: src/main/xmli18n-tmp.h:472
msgid "Epson AcuLaser C8600"
-msgstr ""
+msgstr "Epson AcuLaser C8600"
#: src/main/xmli18n-tmp.h:473
msgid "Epson AcuLaser C8600PS"
-msgstr ""
+msgstr "Epson AcuLaser C8600PS"
#: src/main/xmli18n-tmp.h:474
msgid "Epson EPL-5200"
-msgstr ""
+msgstr "Epson EPL-5200"
#: src/main/xmli18n-tmp.h:475
msgid "Epson EPL-5200+"
-msgstr ""
+msgstr "Epson EPL-5200+"
#: src/main/xmli18n-tmp.h:476
msgid "Epson EPL-5700"
-msgstr ""
+msgstr "Epson EPL-5700"
#: src/main/xmli18n-tmp.h:477
msgid "Epson EPL-5700PS"
-msgstr ""
+msgstr "Epson EPL-5700PS"
#: src/main/xmli18n-tmp.h:478
msgid "Epson EPL-5800"
-msgstr ""
+msgstr "Epson EPL-5800"
#: src/main/xmli18n-tmp.h:479
msgid "Epson EPL-5800PS"
-msgstr ""
+msgstr "Epson EPL-5800PS"
#: src/main/xmli18n-tmp.h:480
msgid "Epson EPL-5900"
-msgstr ""
+msgstr "Epson EPL-5900"
#: src/main/xmli18n-tmp.h:481
msgid "Epson EPL-5900PS"
-msgstr ""
+msgstr "Epson EPL-5900PS"
#: src/main/xmli18n-tmp.h:482
msgid "Epson EPL-6100"
-msgstr ""
+msgstr "Epson EPL-6100"
#: src/main/xmli18n-tmp.h:483
msgid "Epson EPL-6100PS"
-msgstr ""
+msgstr "Epson EPL-6100PS"
#: src/main/xmli18n-tmp.h:484
msgid "Epson EPL-7100"
-msgstr ""
+msgstr "Epson EPL-7100"
#: src/main/xmli18n-tmp.h:485
msgid "Fujitsu PrintPartner 10V"
-msgstr ""
+msgstr "Fujitsu PrintPartner 10V"
#: src/main/xmli18n-tmp.h:486
msgid "Fujitsu PrintPartner 16DV"
-msgstr ""
+msgstr "Fujitsu PrintPartner 16DV"
#: src/main/xmli18n-tmp.h:487
msgid "Fujitsu PrintPartner 20W"
-msgstr ""
+msgstr "Fujitsu PrintPartner 20W"
#: src/main/xmli18n-tmp.h:488
msgid "Fujitsu PrintPartner 8000"
-msgstr ""
+msgstr "Fujitsu PrintPartner 8000"
#: src/main/xmli18n-tmp.h:489
-#, fuzzy
msgid "Generic PCL 4 Printer"
-msgstr "Define New Printer"
+msgstr "Generic PCL 4 Printer"
#: src/main/xmli18n-tmp.h:490
-#, fuzzy
msgid "Generic PCL 5 Printer"
-msgstr "Define New Printer"
+msgstr "Generic PCL 5 Printer"
#: src/main/xmli18n-tmp.h:491
-#, fuzzy
msgid "Generic PCL 5c Printer"
-msgstr "Define New Printer"
+msgstr "Generic PCL 5c Printer"
#: src/main/xmli18n-tmp.h:492
-#, fuzzy
msgid "Generic PCL 5e Printer"
-msgstr "Define New Printer"
+msgstr "Generic PCL 5e Printer"
#: src/main/xmli18n-tmp.h:493
msgid "Generic PCL 6/PCL XL Printer"
-msgstr ""
+msgstr "Generic PCL 6/PCL XL Printer"
#: src/main/xmli18n-tmp.h:494
-#, fuzzy
msgid "HP Business Inkjet 2200"
-msgstr "HP DeskJet 1200C"
+msgstr "HP Business Inkjet 2200"
#: src/main/xmli18n-tmp.h:495
-#, fuzzy
msgid "HP Business Inkjet 2230"
-msgstr "HP DesignJet 230"
+msgstr "HP Business Inkjet 2230"
#: src/main/xmli18n-tmp.h:496
-#, fuzzy
msgid "HP Business Inkjet 2250"
-msgstr "HP DeskJet 1220C"
+msgstr "HP Business Inkjet 2250"
#: src/main/xmli18n-tmp.h:497
msgid "HP Business Inkjet 2250TN"
-msgstr ""
+msgstr "HP Business Inkjet 2250TN"
#: src/main/xmli18n-tmp.h:498
-#, fuzzy
msgid "HP Business Inkjet 2280"
-msgstr "HP DeskJet 1220C"
+msgstr "HP Business Inkjet 2280"
#: src/main/xmli18n-tmp.h:499
msgid "HP Color Inkjet Printer CP1160"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1160"
#: src/main/xmli18n-tmp.h:500
msgid "HP Color Inkjet Printer CP1700"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1700"
#: src/main/xmli18n-tmp.h:501
-#, fuzzy
msgid "HP Color LaserJet 2500"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 2500"
#: src/main/xmli18n-tmp.h:502
-#, fuzzy
msgid "HP Color LaserJet 4500"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4500"
#: src/main/xmli18n-tmp.h:503
-#, fuzzy
msgid "HP Color LaserJet 4550"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4550"
#: src/main/xmli18n-tmp.h:504
-#, fuzzy
msgid "HP Color LaserJet 4600"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4600"
#: src/main/xmli18n-tmp.h:505
-#, fuzzy
msgid "HP Color LaserJet 5"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5"
#: src/main/xmli18n-tmp.h:506
-#, fuzzy
msgid "HP Color LaserJet 5000"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5000"
#: src/main/xmli18n-tmp.h:507
-#, fuzzy
msgid "HP Color LaserJet 5500"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5500"
#: src/main/xmli18n-tmp.h:508
-#, fuzzy
msgid "HP Color LaserJet 8550GN"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 8550GN"
#: src/main/xmli18n-tmp.h:509
msgid "HP DesignJet 230"
@@ -4670,42 +4293,36 @@ msgid "HP DesignJet 700"
msgstr "HP DesignJet 700"
#: src/main/xmli18n-tmp.h:516
-#, fuzzy
msgid "HP DesignJet 750C Plus"
-msgstr "HP DesignJet 750C"
+msgstr "HP DesignJet 750C Plus"
#: src/main/xmli18n-tmp.h:517
msgid "HP DesignJet 750C"
msgstr "HP DesignJet 750C"
#: src/main/xmli18n-tmp.h:518
-#, fuzzy
msgid "HP DesignJet 2500CP"
-msgstr "HP DesignJet 2500C"
+msgstr "HP DesignJet 2500CP"
#: src/main/xmli18n-tmp.h:519
-#, fuzzy
msgid "HP DesignJet 3500CP"
-msgstr "HP DesignJet 3500C"
+msgstr "HP DesignJet 3500CP"
#: src/main/xmli18n-tmp.h:520
-#, fuzzy
msgid "HP DesignJet ColorPro CAD"
-msgstr "HP DesignJet 455CA"
+msgstr "HP DesignJet ColorPro CAD"
#: src/main/xmli18n-tmp.h:521
msgid "HP DeskJet 400"
msgstr "HP DeskJet 400"
#: src/main/xmli18n-tmp.h:522
-#, fuzzy
msgid "HP DeskJet 420C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 420C"
#: src/main/xmli18n-tmp.h:523
-#, fuzzy
msgid "HP DeskJet 450"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 450"
#: src/main/xmli18n-tmp.h:524
msgid "HP DeskJet 500"
@@ -4716,14 +4333,12 @@ msgid "HP DeskJet 500C"
msgstr "HP DeskJet 500C"
#: src/main/xmli18n-tmp.h:526
-#, fuzzy
msgid "HP DeskJet 505J Plus"
-msgstr "HP DeskJet 520"
+msgstr "HP DeskJet 505J Plus"
#: src/main/xmli18n-tmp.h:527
-#, fuzzy
msgid "HP DeskJet 510"
-msgstr "HP DeskJet 500"
+msgstr "HP DeskJet 510"
#: src/main/xmli18n-tmp.h:528
msgid "HP DeskJet 520"
@@ -4738,123 +4353,100 @@ msgid "HP DeskJet 550C"
msgstr "HP DeskJet 550C"
#: src/main/xmli18n-tmp.h:531
-#, fuzzy
msgid "HP DeskJet 5550"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 5550"
#: src/main/xmli18n-tmp.h:532
-#, fuzzy
msgid "HP DeskJet 5551"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 5551"
#: src/main/xmli18n-tmp.h:533
msgid "HP DeskJet 560C"
msgstr "HP DeskJet 560C"
#: src/main/xmli18n-tmp.h:534
-#, fuzzy
msgid "HP DeskJet 600"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 600"
#: src/main/xmli18n-tmp.h:535
-#, fuzzy
msgid "HP DeskJet 600C"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 600C"
#: src/main/xmli18n-tmp.h:536
-#, fuzzy
msgid "HP DeskJet 610C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 610C"
#: src/main/xmli18n-tmp.h:537
-#, fuzzy
msgid "HP DeskJet 610CL"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 610CL"
#: src/main/xmli18n-tmp.h:538
-#, fuzzy
msgid "HP DeskJet 6122"
-msgstr "HP DeskJet 1220C"
+msgstr "HP DeskJet 6122"
#: src/main/xmli18n-tmp.h:539
-#, fuzzy
msgid "HP DeskJet 6127"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 6127"
#: src/main/xmli18n-tmp.h:540
-#, fuzzy
msgid "HP DeskJet 612C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 612C"
#: src/main/xmli18n-tmp.h:541
-#, fuzzy
msgid "HP DeskJet 640C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 640C"
#: src/main/xmli18n-tmp.h:542
-#, fuzzy
msgid "HP DeskJet 648C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 648C"
#: src/main/xmli18n-tmp.h:543
-#, fuzzy
msgid "HP DeskJet 660C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 660C"
#: src/main/xmli18n-tmp.h:544
-#, fuzzy
msgid "HP DeskJet 670C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 670C"
#: src/main/xmli18n-tmp.h:545
-#, fuzzy
msgid "HP DeskJet 670TV"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 670TV"
#: src/main/xmli18n-tmp.h:546
-#, fuzzy
msgid "HP DeskJet 672C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 672C"
#: src/main/xmli18n-tmp.h:547
-#, fuzzy
msgid "HP DeskJet 680C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 680C"
#: src/main/xmli18n-tmp.h:548
-#, fuzzy
msgid "HP DeskJet 682C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 682C"
#: src/main/xmli18n-tmp.h:549
-#, fuzzy
msgid "HP DeskJet 690C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 690C"
#: src/main/xmli18n-tmp.h:550
-#, fuzzy
msgid "HP DeskJet 692C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 692C"
#: src/main/xmli18n-tmp.h:551
-#, fuzzy
msgid "HP DeskJet 693C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 693C"
#: src/main/xmli18n-tmp.h:552
-#, fuzzy
msgid "HP DeskJet 694C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 694C"
#: src/main/xmli18n-tmp.h:553
-#, fuzzy
msgid "HP DeskJet 695C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 695C"
#: src/main/xmli18n-tmp.h:554
-#, fuzzy
msgid "HP DeskJet 697C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 697C"
#: src/main/xmli18n-tmp.h:555
msgid "HP DeskJet 810C"
@@ -4865,47 +4457,40 @@ msgid "HP DeskJet 812C"
msgstr "HP DeskJet 812C"
#: src/main/xmli18n-tmp.h:557
-#, fuzzy
msgid "HP DeskJet 815C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 815C"
#: src/main/xmli18n-tmp.h:558
-#, fuzzy
msgid "HP DeskJet 816C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 816C"
#: src/main/xmli18n-tmp.h:559
-#, fuzzy
msgid "HP DeskJet 825C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 825C"
#: src/main/xmli18n-tmp.h:560
-#, fuzzy
msgid "HP DeskJet 830C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 830C"
#: src/main/xmli18n-tmp.h:561
-#, fuzzy
msgid "HP DeskJet 832C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 832C"
#: src/main/xmli18n-tmp.h:562
msgid "HP DeskJet 840C"
msgstr "HP DeskJet 840C"
#: src/main/xmli18n-tmp.h:563
-#, fuzzy
msgid "HP DeskJet 841C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 841C"
#: src/main/xmli18n-tmp.h:564
msgid "HP DeskJet 842C"
msgstr "HP DeskJet 842C"
#: src/main/xmli18n-tmp.h:565
-#, fuzzy
msgid "HP DeskJet 843C"
-msgstr "HP DeskJet 840C"
+msgstr "HP DeskJet 843C"
#: src/main/xmli18n-tmp.h:566
msgid "HP DeskJet 845C"
@@ -4924,14 +4509,12 @@ msgid "HP DeskJet 870C"
msgstr "HP DeskJet 870C"
#: src/main/xmli18n-tmp.h:570
-#, fuzzy
msgid "HP DeskJet 880C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 880C"
#: src/main/xmli18n-tmp.h:571
-#, fuzzy
msgid "HP DeskJet 882C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 882C"
#: src/main/xmli18n-tmp.h:572
msgid "HP DeskJet 890C"
@@ -4942,109 +4525,88 @@ msgid "HP DeskJet 895C"
msgstr "HP DeskJet 895C"
#: src/main/xmli18n-tmp.h:574
-#, fuzzy
msgid "HP DeskJet 916C"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 916C"
#: src/main/xmli18n-tmp.h:575
-#, fuzzy
msgid "HP DeskJet 920C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 920C"
#: src/main/xmli18n-tmp.h:576
-#, fuzzy
msgid "HP DeskJet 9300"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 9300"
#: src/main/xmli18n-tmp.h:577
-#, fuzzy
msgid "HP DeskJet 930C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 930C"
#: src/main/xmli18n-tmp.h:578
-#, fuzzy
msgid "HP DeskJet 932C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 932C"
#: src/main/xmli18n-tmp.h:579
-#, fuzzy
msgid "HP DeskJet 933C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 933C"
#: src/main/xmli18n-tmp.h:580
-#, fuzzy
msgid "HP DeskJet 934C"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 934C"
#: src/main/xmli18n-tmp.h:581
-#, fuzzy
msgid "HP DeskJet 935C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 935C"
#: src/main/xmli18n-tmp.h:582
-#, fuzzy
msgid "HP DeskJet 940C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 940C"
#: src/main/xmli18n-tmp.h:583
-#, fuzzy
msgid "HP DeskJet 948C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 948C"
#: src/main/xmli18n-tmp.h:584
-#, fuzzy
msgid "HP DeskJet 950C"
-msgstr "HP DeskJet 500C"
+msgstr "HP DeskJet 950C"
#: src/main/xmli18n-tmp.h:585
-#, fuzzy
msgid "HP DeskJet 952C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 952C"
#: src/main/xmli18n-tmp.h:586
-#, fuzzy
msgid "HP DeskJet 955C"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 955C"
#: src/main/xmli18n-tmp.h:587
-#, fuzzy
msgid "HP DeskJet 957C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 957C"
#: src/main/xmli18n-tmp.h:588
-#, fuzzy
msgid "HP DeskJet 959C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 959C"
#: src/main/xmli18n-tmp.h:589
-#, fuzzy
msgid "HP DeskJet 960C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 960C"
#: src/main/xmli18n-tmp.h:590
-#, fuzzy
msgid "HP DeskJet 970C"
-msgstr "HP DeskJet 870C"
+msgstr "HP DeskJet 970C"
#: src/main/xmli18n-tmp.h:591
-#, fuzzy
msgid "HP DeskJet 975C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 975C"
#: src/main/xmli18n-tmp.h:592
-#, fuzzy
msgid "HP DeskJet 980C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 980C"
#: src/main/xmli18n-tmp.h:593
-#, fuzzy
msgid "HP DeskJet 990C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 990C"
#: src/main/xmli18n-tmp.h:594
-#, fuzzy
msgid "HP DeskJet 995C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 995C"
#: src/main/xmli18n-tmp.h:595
msgid "HP DeskJet 1100C"
@@ -5055,9 +4617,8 @@ msgid "HP DeskJet 1120C"
msgstr "HP DeskJet 1120C"
#: src/main/xmli18n-tmp.h:597
-#, fuzzy
msgid "HP DeskJet 1125C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP DeskJet 1125C"
#: src/main/xmli18n-tmp.h:598
msgid "HP DeskJet 1200C"
@@ -5072,118 +4633,96 @@ msgid "HP DeskJet 1600C"
msgstr "HP DeskJet 1600C"
#: src/main/xmli18n-tmp.h:601
-#, fuzzy
msgid "HP DeskJet 1600CM"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600CM"
#: src/main/xmli18n-tmp.h:602
-#, fuzzy
msgid "HP DeskJet 2000"
-msgstr "HP DeskJet 1200C"
+msgstr "HP DeskJet 2000"
#: src/main/xmli18n-tmp.h:603
-#, fuzzy
msgid "HP DeskJet 2500"
-msgstr "HP DeskJet 500"
+msgstr "HP DeskJet 2500"
#: src/main/xmli18n-tmp.h:604
-#, fuzzy
msgid "HP DeskJet 2500CM"
-msgstr "HP DeskJet 500C"
+msgstr "HP DeskJet 2500CM"
#: src/main/xmli18n-tmp.h:605
-#, fuzzy
msgid "HP DeskJet 340C"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 340C"
#: src/main/xmli18n-tmp.h:606
-#, fuzzy
msgid "HP DeskJet 3810"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 3810"
#: src/main/xmli18n-tmp.h:607
-#, fuzzy
msgid "HP DeskJet 3816"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 3816"
#: src/main/xmli18n-tmp.h:608
-#, fuzzy
msgid "HP DeskJet 3820"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 3820"
#: src/main/xmli18n-tmp.h:609
-#, fuzzy
msgid "HP DeskJet 3822"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 3822"
#: src/main/xmli18n-tmp.h:610
-#, fuzzy
msgid "HP LaserJet 2"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2"
#: src/main/xmli18n-tmp.h:611
-#, fuzzy
msgid "HP LaserJet 2D"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2D"
#: src/main/xmli18n-tmp.h:612
-#, fuzzy
msgid "HP LaserJet 2P Plus"
-msgstr "HP LaserJet IIP series"
+msgstr "HP LaserJet 2P Plus"
#: src/main/xmli18n-tmp.h:613
-#, fuzzy
msgid "HP LaserJet 2P"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2P"
#: src/main/xmli18n-tmp.h:614
-#, fuzzy
msgid "HP LaserJet 3"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3"
#: src/main/xmli18n-tmp.h:615
-#, fuzzy
msgid "HP LaserJet 3D"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3D"
#: src/main/xmli18n-tmp.h:616
-#, fuzzy
msgid "HP LaserJet 3P w/ PCL5"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3P w/ PCL5"
#: src/main/xmli18n-tmp.h:617
-#, fuzzy
msgid "HP LaserJet 3P w/PS"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 3P w/PS"
#: src/main/xmli18n-tmp.h:618
-#, fuzzy
msgid "HP LaserJet 4 Plus"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4 Plus"
#: src/main/xmli18n-tmp.h:619
-#, fuzzy
msgid "HP LaserJet 4"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 4"
#: src/main/xmli18n-tmp.h:620
msgid "HP LaserJet 4L"
msgstr "HP LaserJet 4L"
#: src/main/xmli18n-tmp.h:621
-#, fuzzy
msgid "HP LaserJet 4M"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4M"
#: src/main/xmli18n-tmp.h:622
-#, fuzzy
msgid "HP LaserJet 4ML"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4ML"
#: src/main/xmli18n-tmp.h:623
-#, fuzzy
msgid "HP LaserJet 4P"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4P"
#: src/main/xmli18n-tmp.h:624
msgid "HP LaserJet 4Si"
@@ -5194,540 +4733,444 @@ msgid "HP LaserJet 4V"
msgstr "HP LaserJet 4V"
#: src/main/xmli18n-tmp.h:626
-#, fuzzy
msgid "HP LaserJet 5"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5"
#: src/main/xmli18n-tmp.h:627
-#, fuzzy
msgid "HP LaserJet 5L"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 5L"
#: src/main/xmli18n-tmp.h:628
-#, fuzzy
msgid "HP LaserJet 5M"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5M"
#: src/main/xmli18n-tmp.h:629
-#, fuzzy
msgid "HP LaserJet 5MP"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5MP"
#: src/main/xmli18n-tmp.h:630
-#, fuzzy
msgid "HP LaserJet 5P"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5P"
#: src/main/xmli18n-tmp.h:631
msgid "HP LaserJet 5Si"
msgstr "HP LaserJet 5Si"
#: src/main/xmli18n-tmp.h:632
-#, fuzzy
msgid "HP LaserJet 6"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6"
#: src/main/xmli18n-tmp.h:633
-#, fuzzy
msgid "HP LaserJet 6L"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 6L"
#: src/main/xmli18n-tmp.h:634
-#, fuzzy
msgid "HP LaserJet 6MP"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6MP"
#: src/main/xmli18n-tmp.h:635
-#, fuzzy
msgid "HP LaserJet 6P"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6P"
#: src/main/xmli18n-tmp.h:636
-#, fuzzy
msgid "HP LaserJet 1010"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1010"
#: src/main/xmli18n-tmp.h:637
-#, fuzzy
msgid "HP LaserJet 1012"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1012"
#: src/main/xmli18n-tmp.h:638
-#, fuzzy
msgid "HP LaserJet 1015"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 1015"
#: src/main/xmli18n-tmp.h:639
-#, fuzzy
msgid "HP LaserJet 1100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1100"
#: src/main/xmli18n-tmp.h:640
-#, fuzzy
msgid "HP LaserJet 1100A"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 1100A"
#: src/main/xmli18n-tmp.h:641
-#, fuzzy
msgid "HP LaserJet 1150"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 1150"
#: src/main/xmli18n-tmp.h:642
-#, fuzzy
msgid "HP LaserJet 1200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1200"
#: src/main/xmli18n-tmp.h:643
-#, fuzzy
msgid "HP LaserJet 1220"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1220"
#: src/main/xmli18n-tmp.h:644
-#, fuzzy
msgid "HP LaserJet 1300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1300"
#: src/main/xmli18n-tmp.h:645
-#, fuzzy
msgid "HP LaserJet 2100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2100"
#: src/main/xmli18n-tmp.h:646
-#, fuzzy
msgid "HP LaserJet 2100M"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2100M"
#: src/main/xmli18n-tmp.h:647
-#, fuzzy
msgid "HP LaserJet 2200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2200"
#: src/main/xmli18n-tmp.h:648
-#, fuzzy
msgid "HP LaserJet 2300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2300"
#: src/main/xmli18n-tmp.h:649
-#, fuzzy
msgid "HP LaserJet 3200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3200"
#: src/main/xmli18n-tmp.h:650
-#, fuzzy
msgid "HP LaserJet 3200m"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3200m"
#: src/main/xmli18n-tmp.h:651
-#, fuzzy
msgid "HP LaserJet 3200se"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3200se"
#: src/main/xmli18n-tmp.h:652
-#, fuzzy
msgid "HP LaserJet 3300 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3300 MFP"
#: src/main/xmli18n-tmp.h:653
-#, fuzzy
msgid "HP LaserJet 3310 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3310 MFP"
#: src/main/xmli18n-tmp.h:654
-#, fuzzy
msgid "HP LaserJet 3320 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3320 MFP"
#: src/main/xmli18n-tmp.h:655
-#, fuzzy
msgid "HP LaserJet 3320N MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3320N MFP"
#: src/main/xmli18n-tmp.h:656
-#, fuzzy
msgid "HP LaserJet 3330 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3330 MFP"
#: src/main/xmli18n-tmp.h:657
-#, fuzzy
msgid "HP LaserJet 4000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4000"
#: src/main/xmli18n-tmp.h:658
-#, fuzzy
msgid "HP LaserJet 4050"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4050"
#: src/main/xmli18n-tmp.h:659
-#, fuzzy
msgid "HP LaserJet 4100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4100"
#: src/main/xmli18n-tmp.h:660
-#, fuzzy
msgid "HP LaserJet 4200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4200"
#: src/main/xmli18n-tmp.h:661
-#, fuzzy
msgid "HP LaserJet 4300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4300"
#: src/main/xmli18n-tmp.h:662
-#, fuzzy
msgid "HP LaserJet 5000"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5000"
#: src/main/xmli18n-tmp.h:663
-#, fuzzy
msgid "HP LaserJet 5100"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5100"
#: src/main/xmli18n-tmp.h:664
-#, fuzzy
msgid "HP LaserJet 8000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 8000"
#: src/main/xmli18n-tmp.h:665
-#, fuzzy
msgid "HP LaserJet 8100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 8100"
#: src/main/xmli18n-tmp.h:666
-#, fuzzy
msgid "HP LaserJet 8150"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 8150"
#: src/main/xmli18n-tmp.h:667
-#, fuzzy
msgid "HP LaserJet 9000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 9000"
#: src/main/xmli18n-tmp.h:668
msgid "HP Mopier 240"
-msgstr ""
+msgstr "HP Mopier 240"
#: src/main/xmli18n-tmp.h:669
msgid "HP Mopier 320"
-msgstr ""
+msgstr "HP Mopier 320"
#: src/main/xmli18n-tmp.h:670
-#, fuzzy
msgid "HP OfficeJet 300"
-msgstr "HP DeskJet 500"
+msgstr "HP OfficeJet 300"
#: src/main/xmli18n-tmp.h:671
-#, fuzzy
msgid "HP OfficeJet 330"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 330"
#: src/main/xmli18n-tmp.h:672
-#, fuzzy
msgid "HP OfficeJet 350"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 350"
#: src/main/xmli18n-tmp.h:673
-#, fuzzy
msgid "HP OfficeJet 500"
-msgstr "HP DeskJet 500"
+msgstr "HP OfficeJet 500"
#: src/main/xmli18n-tmp.h:674
-#, fuzzy
msgid "HP OfficeJet 520"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 520"
#: src/main/xmli18n-tmp.h:675
-#, fuzzy
msgid "HP OfficeJet 570"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 570"
#: src/main/xmli18n-tmp.h:676
-#, fuzzy
msgid "HP OfficeJet 580"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 580"
#: src/main/xmli18n-tmp.h:677
-#, fuzzy
msgid "HP OfficeJet 590"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 590"
#: src/main/xmli18n-tmp.h:678
-#, fuzzy
msgid "HP OfficeJet 600"
-msgstr "HP DeskJet 1600C"
+msgstr "HP OfficeJet 600"
#: src/main/xmli18n-tmp.h:679
-#, fuzzy
msgid "HP OfficeJet 610"
-msgstr "HP DeskJet 810C"
+msgstr "HP OfficeJet 610"
#: src/main/xmli18n-tmp.h:680
-#, fuzzy
msgid "HP OfficeJet 625"
-msgstr "HP DesignJet 250C"
+msgstr "HP OfficeJet 625"
#: src/main/xmli18n-tmp.h:681
-#, fuzzy
msgid "HP OfficeJet 630"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 630"
#: src/main/xmli18n-tmp.h:682
-#, fuzzy
msgid "HP OfficeJet 635"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 635"
#: src/main/xmli18n-tmp.h:683
-#, fuzzy
msgid "HP OfficeJet 700"
-msgstr "HP DesignJet 700"
+msgstr "HP OfficeJet 700"
#: src/main/xmli18n-tmp.h:684
-#, fuzzy
msgid "HP OfficeJet 710"
-msgstr "HP DeskJet 870C"
+msgstr "HP OfficeJet 710"
#: src/main/xmli18n-tmp.h:685
-#, fuzzy
msgid "HP OfficeJet 720"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 720"
#: src/main/xmli18n-tmp.h:686
-#, fuzzy
msgid "HP OfficeJet 725"
-msgstr "HP DesignJet 250C"
+msgstr "HP OfficeJet 725"
#: src/main/xmli18n-tmp.h:687
-#, fuzzy
msgid "HP OfficeJet 5105"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 5105"
#: src/main/xmli18n-tmp.h:688
-#, fuzzy
msgid "HP OfficeJet 5110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 5110"
#: src/main/xmli18n-tmp.h:689
-#, fuzzy
msgid "HP OfficeJet 5110xi"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 5110xi"
#: src/main/xmli18n-tmp.h:690
-#, fuzzy
msgid "HP OfficeJet 6105"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet 6105"
#: src/main/xmli18n-tmp.h:691
-#, fuzzy
msgid "HP OfficeJet 6110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 6110"
#: src/main/xmli18n-tmp.h:692
-#, fuzzy
msgid "HP OfficeJet 7110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 7110"
#: src/main/xmli18n-tmp.h:693
-#, fuzzy
msgid "HP OfficeJet 7130"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 7130"
#: src/main/xmli18n-tmp.h:694
-#, fuzzy
msgid "HP OfficeJet 7140"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet 7140"
#: src/main/xmli18n-tmp.h:695
-#, fuzzy
msgid "HP OfficeJet D125"
-msgstr "HP DeskJet 812C"
+msgstr "HP OfficeJet D125"
#: src/main/xmli18n-tmp.h:696
msgid "HP OfficeJet D135"
-msgstr ""
+msgstr "HP OfficeJet D135"
#: src/main/xmli18n-tmp.h:697
-#, fuzzy
msgid "HP OfficeJet D145"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet D145"
#: src/main/xmli18n-tmp.h:698
-#, fuzzy
msgid "HP OfficeJet D155"
-msgstr "HP DeskJet 550C"
+msgstr "HP OfficeJet D155"
#: src/main/xmli18n-tmp.h:699
-#, fuzzy
msgid "HP OfficeJet G55"
-msgstr "HP DeskJet 855C"
+msgstr "HP OfficeJet G55"
#: src/main/xmli18n-tmp.h:700
-#, fuzzy
msgid "HP OfficeJet G85"
-msgstr "HP DeskJet 895C"
+msgstr "HP OfficeJet G85"
#: src/main/xmli18n-tmp.h:701
-#, fuzzy
msgid "HP OfficeJet G95"
-msgstr "HP DeskJet 895C"
+msgstr "HP OfficeJet G95"
#: src/main/xmli18n-tmp.h:702
-#, fuzzy
msgid "HP OfficeJet K60"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet K60"
#: src/main/xmli18n-tmp.h:703
-#, fuzzy
msgid "HP OfficeJet K60xi"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet K60xi"
#: src/main/xmli18n-tmp.h:704
-#, fuzzy
msgid "HP OfficeJet K80"
-msgstr "HP DeskJet 890C"
+msgstr "HP OfficeJet K80"
#: src/main/xmli18n-tmp.h:705
-#, fuzzy
msgid "HP OfficeJet K80xi"
-msgstr "HP DeskJet 810C"
+msgstr "HP OfficeJet K80xi"
#: src/main/xmli18n-tmp.h:706
-#, fuzzy
msgid "HP OfficeJet LX"
-msgstr "HP LaserJet 4L"
+msgstr "HP OfficeJet LX"
#: src/main/xmli18n-tmp.h:707
-#, fuzzy
msgid "HP OfficeJet Pro 1150C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet Pro 1150C"
#: src/main/xmli18n-tmp.h:708
-#, fuzzy
msgid "HP OfficeJet Pro 1170C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet Pro 1170C"
#: src/main/xmli18n-tmp.h:709
msgid "HP OfficeJet Pro 1175C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1175C"
#: src/main/xmli18n-tmp.h:710
-#, fuzzy
msgid "HP OfficeJet R40"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet R40"
#: src/main/xmli18n-tmp.h:711
-#, fuzzy
msgid "HP OfficeJet R45"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet R45"
#: src/main/xmli18n-tmp.h:712
-#, fuzzy
msgid "HP OfficeJet R60"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet R60"
#: src/main/xmli18n-tmp.h:713
-#, fuzzy
msgid "HP OfficeJet R65"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet R65"
#: src/main/xmli18n-tmp.h:714
-#, fuzzy
msgid "HP OfficeJet R80"
-msgstr "HP DeskJet 890C"
+msgstr "HP OfficeJet R80"
#: src/main/xmli18n-tmp.h:715
-#, fuzzy
msgid "HP OfficeJet T45"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet T45"
#: src/main/xmli18n-tmp.h:716
-#, fuzzy
msgid "HP OfficeJet T65"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet T65"
#: src/main/xmli18n-tmp.h:717
-#, fuzzy
msgid "HP OfficeJet V40"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet V40"
#: src/main/xmli18n-tmp.h:718
-#, fuzzy
msgid "HP OfficeJet V40xi"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet V40xi"
#: src/main/xmli18n-tmp.h:719
msgid "HP OfficeJet"
-msgstr ""
+msgstr "HP OfficeJet"
#: src/main/xmli18n-tmp.h:720
msgid "HP PSC 370"
-msgstr ""
+msgstr "HP PSC 370"
#: src/main/xmli18n-tmp.h:721
msgid "HP PSC 380"
-msgstr ""
+msgstr "HP PSC 380"
#: src/main/xmli18n-tmp.h:722
msgid "HP PSC 500"
-msgstr ""
+msgstr "HP PSC 500"
#: src/main/xmli18n-tmp.h:723
msgid "HP PSC 750"
-msgstr ""
+msgstr "HP PSC 750"
#: src/main/xmli18n-tmp.h:724
msgid "HP PSC 950"
-msgstr ""
+msgstr "HP PSC 950"
#: src/main/xmli18n-tmp.h:725
msgid "HP PSC 950xi"
-msgstr ""
+msgstr "HP PSC 950xi"
#: src/main/xmli18n-tmp.h:726
-#, fuzzy
msgid "HP PSC 2110"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PSC 2110"
#: src/main/xmli18n-tmp.h:727
msgid "HP PSC 2150"
-msgstr ""
+msgstr "HP PSC 2150"
#: src/main/xmli18n-tmp.h:728
msgid "HP PSC 2210"
-msgstr ""
+msgstr "HP PSC 2210"
#: src/main/xmli18n-tmp.h:729
-#, fuzzy
msgid "HP PhotoSmart 7150"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7150"
#: src/main/xmli18n-tmp.h:730
-#, fuzzy
msgid "HP PhotoSmart 7345"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7345"
#: src/main/xmli18n-tmp.h:731
-#, fuzzy
msgid "HP PhotoSmart 7350"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7350"
#: src/main/xmli18n-tmp.h:732
-#, fuzzy
msgid "HP PhotoSmart 7550"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7550"
#: src/main/xmli18n-tmp.h:733
-#, fuzzy
msgid "HP PhotoSmart P100"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P100"
#: src/main/xmli18n-tmp.h:734
-#, fuzzy
msgid "HP PhotoSmart P130"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P130"
#: src/main/xmli18n-tmp.h:735
-#, fuzzy
msgid "HP PhotoSmart P230"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P230"
#: src/main/xmli18n-tmp.h:736
msgid "HP PhotoSmart P1000"
@@ -5738,512 +5181,504 @@ msgid "HP PhotoSmart P1100"
msgstr "HP PhotoSmart P1100"
#: src/main/xmli18n-tmp.h:738
-#, fuzzy
msgid "HP PhotoSmart P1115"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1115"
#: src/main/xmli18n-tmp.h:739
-#, fuzzy
msgid "HP PhotoSmart P1215"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1215"
#: src/main/xmli18n-tmp.h:740
-#, fuzzy
msgid "HP PhotoSmart P1218"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1218"
#: src/main/xmli18n-tmp.h:741
-#, fuzzy
msgid "HP PhotoSmart P1315"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1315"
#: src/main/xmli18n-tmp.h:742
-#, fuzzy
msgid "HP e-printer e20"
-msgstr "HP DesignJet 230"
+msgstr "HP e-printer e20"
#: src/main/xmli18n-tmp.h:743
msgid "IBM 4019"
-msgstr ""
+msgstr "IBM 4019"
#: src/main/xmli18n-tmp.h:744
msgid "IBM 4029 030 LaserPrinter 10"
-msgstr ""
+msgstr "IBM 4029 030 LaserPrinter 10"
#: src/main/xmli18n-tmp.h:745
msgid "IBM 4312"
-msgstr ""
+msgstr "IBM 4312"
#: src/main/xmli18n-tmp.h:746
msgid "IBM Infoprint 12"
-msgstr ""
+msgstr "IBM Infoprint 12"
#: src/main/xmli18n-tmp.h:747
msgid "IBM Page Printer 3112"
-msgstr ""
+msgstr "IBM Page Printer 3112"
#: src/main/xmli18n-tmp.h:748
msgid "Infotec 4651 MF"
-msgstr ""
+msgstr "Infotec 4651 MF"
#: src/main/xmli18n-tmp.h:749
msgid "Kyocera F-1010"
-msgstr ""
+msgstr "Kyocera F-1010"
#: src/main/xmli18n-tmp.h:750
msgid "Kyocera FS-600 - KPDL-2"
-msgstr ""
+msgstr "Kyocera FS-600 - KPDL-2"
#: src/main/xmli18n-tmp.h:751
msgid "Kyocera FS-600"
-msgstr ""
+msgstr "Kyocera FS-600"
#: src/main/xmli18n-tmp.h:752
msgid "Kyocera FS-680"
-msgstr ""
+msgstr "Kyocera FS-680"
#: src/main/xmli18n-tmp.h:753
msgid "Kyocera FS-800"
-msgstr ""
+msgstr "Kyocera FS-800"
#: src/main/xmli18n-tmp.h:754
msgid "Kyocera FS-1000"
-msgstr ""
+msgstr "Kyocera FS-1000"
#: src/main/xmli18n-tmp.h:755
msgid "Kyocera FS-1000+"
-msgstr ""
+msgstr "Kyocera FS-1000+"
#: src/main/xmli18n-tmp.h:756
msgid "Kyocera FS-1010"
-msgstr ""
+msgstr "Kyocera FS-1010"
#: src/main/xmli18n-tmp.h:757
msgid "Kyocera FS-1050"
-msgstr ""
+msgstr "Kyocera FS-1050"
#: src/main/xmli18n-tmp.h:758
msgid "Kyocera FS-1200"
-msgstr ""
+msgstr "Kyocera FS-1200"
#: src/main/xmli18n-tmp.h:759
msgid "Kyocera FS-1600"
-msgstr ""
+msgstr "Kyocera FS-1600"
#: src/main/xmli18n-tmp.h:760
msgid "Kyocera FS-1600+"
-msgstr ""
+msgstr "Kyocera FS-1600+"
#: src/main/xmli18n-tmp.h:761
msgid "Kyocera FS-1700"
-msgstr ""
+msgstr "Kyocera FS-1700"
#: src/main/xmli18n-tmp.h:762
msgid "Kyocera FS-1700+"
-msgstr ""
+msgstr "Kyocera FS-1700+"
#: src/main/xmli18n-tmp.h:763
msgid "Kyocera FS-1750"
-msgstr ""
+msgstr "Kyocera FS-1750"
#: src/main/xmli18n-tmp.h:764
msgid "Kyocera FS-1800"
-msgstr ""
+msgstr "Kyocera FS-1800"
#: src/main/xmli18n-tmp.h:765
msgid "Kyocera FS-1800+"
-msgstr ""
+msgstr "Kyocera FS-1800+"
#: src/main/xmli18n-tmp.h:766
msgid "Kyocera FS-1900"
-msgstr ""
+msgstr "Kyocera FS-1900"
#: src/main/xmli18n-tmp.h:767
msgid "Kyocera FS-3500"
-msgstr ""
+msgstr "Kyocera FS-3500"
#: src/main/xmli18n-tmp.h:768
msgid "Kyocera FS-3600"
-msgstr ""
+msgstr "Kyocera FS-3600"
#: src/main/xmli18n-tmp.h:769
msgid "Kyocera FS-3600+"
-msgstr ""
+msgstr "Kyocera FS-3600+"
#: src/main/xmli18n-tmp.h:770
msgid "Kyocera FS-3700"
-msgstr ""
+msgstr "Kyocera FS-3700"
#: src/main/xmli18n-tmp.h:771
msgid "Kyocera FS-3700+"
-msgstr ""
+msgstr "Kyocera FS-3700+"
#: src/main/xmli18n-tmp.h:772
msgid "Kyocera FS-3750"
-msgstr ""
+msgstr "Kyocera FS-3750"
#: src/main/xmli18n-tmp.h:773
msgid "Kyocera FS-3800"
-msgstr ""
+msgstr "Kyocera FS-3800"
#: src/main/xmli18n-tmp.h:774
msgid "Kyocera FS-5800C"
-msgstr ""
+msgstr "Kyocera FS-5800C"
#: src/main/xmli18n-tmp.h:775
msgid "Kyocera FS-5900C"
-msgstr ""
+msgstr "Kyocera FS-5900C"
#: src/main/xmli18n-tmp.h:776
msgid "Kyocera FS-6500"
-msgstr ""
+msgstr "Kyocera FS-6500"
#: src/main/xmli18n-tmp.h:777
msgid "Kyocera FS-6500+"
-msgstr ""
+msgstr "Kyocera FS-6500+"
#: src/main/xmli18n-tmp.h:778
msgid "Kyocera FS-6700"
-msgstr ""
+msgstr "Kyocera FS-6700"
#: src/main/xmli18n-tmp.h:779
msgid "Kyocera FS-7000"
-msgstr ""
+msgstr "Kyocera FS-7000"
#: src/main/xmli18n-tmp.h:780
msgid "Kyocera FS-7000+"
-msgstr ""
+msgstr "Kyocera FS-7000+"
#: src/main/xmli18n-tmp.h:781
msgid "Kyocera FS-8000C"
-msgstr ""
+msgstr "Kyocera FS-8000C"
#: src/main/xmli18n-tmp.h:782
msgid "Kyocera FS-9000"
-msgstr ""
+msgstr "Kyocera FS-9000"
#: src/main/xmli18n-tmp.h:783
msgid "Kyocera FS-9100DN"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
#: src/main/xmli18n-tmp.h:784
msgid "Kyocera FS-9500DN"
-msgstr ""
+msgstr "Kyocera FS-9500DN"
#: src/main/xmli18n-tmp.h:785
msgid "Kyocera KM-1530"
-msgstr ""
+msgstr "Kyocera KM-1530"
#: src/main/xmli18n-tmp.h:786
msgid "Kyocera KM-1810"
-msgstr ""
+msgstr "Kyocera KM-1810"
#: src/main/xmli18n-tmp.h:787
msgid "Kyocera KM-2030"
-msgstr ""
+msgstr "Kyocera KM-2030"
#: src/main/xmli18n-tmp.h:788
msgid "Kyocera KM-2530"
-msgstr ""
+msgstr "Kyocera KM-2530"
#: src/main/xmli18n-tmp.h:789
msgid "Kyocera KM-3530"
-msgstr ""
+msgstr "Kyocera KM-3530"
#: src/main/xmli18n-tmp.h:790
msgid "Kyocera KM-4230"
-msgstr ""
+msgstr "Kyocera KM-4230"
#: src/main/xmli18n-tmp.h:791
msgid "Kyocera KM-4530"
-msgstr ""
+msgstr "Kyocera KM-4530"
#: src/main/xmli18n-tmp.h:792
msgid "Kyocera KM-5230"
-msgstr ""
+msgstr "Kyocera KM-5230"
#: src/main/xmli18n-tmp.h:793
msgid "Kyocera KM-5530"
-msgstr ""
+msgstr "Kyocera KM-5530"
#: src/main/xmli18n-tmp.h:794
msgid "Kyocera KM-6230"
-msgstr ""
+msgstr "Kyocera KM-6230"
#: src/main/xmli18n-tmp.h:795
msgid "Lexmark 4076"
msgstr "Lexmark 4076"
#: src/main/xmli18n-tmp.h:796
-#, fuzzy
msgid "Lexmark Optra E"
-msgstr "Lexmark Z42"
+msgstr "Lexmark Optra E"
#: src/main/xmli18n-tmp.h:797
msgid "Lexmark Optra E+"
-msgstr ""
+msgstr "Lexmark Optra E+"
#: src/main/xmli18n-tmp.h:798
msgid "Lexmark Valuewriter 300"
-msgstr ""
+msgstr "Lexmark Valuewriter 300"
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
-msgstr ""
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
-msgstr ""
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
-msgstr ""
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
-msgstr ""
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
-msgstr ""
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
-msgstr ""
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
-msgstr ""
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
-msgstr ""
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
-msgstr ""
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
-msgstr ""
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
-msgstr ""
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
-msgstr ""
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
#: src/main/xmli18n-tmp.h:811
msgid "Okidata OL400"
-msgstr ""
+msgstr "Okidata OL400"
#: src/main/xmli18n-tmp.h:812
msgid "Okidata OL400e"
-msgstr ""
+msgstr "Okidata OL400e"
#: src/main/xmli18n-tmp.h:813
msgid "Okidata OL400ex"
-msgstr ""
+msgstr "Okidata OL400ex"
#: src/main/xmli18n-tmp.h:814
msgid "Okidata OL410e"
-msgstr ""
+msgstr "Okidata OL410e"
#: src/main/xmli18n-tmp.h:815
msgid "Okidata OL600e"
-msgstr ""
+msgstr "Okidata OL600e"
#: src/main/xmli18n-tmp.h:816
msgid "Okidata OL610e/S"
-msgstr ""
+msgstr "Okidata OL610e/S"
#: src/main/xmli18n-tmp.h:817
msgid "Okidata OL800"
-msgstr ""
+msgstr "Okidata OL800"
#: src/main/xmli18n-tmp.h:818
msgid "Okidata OL810ex"
-msgstr ""
+msgstr "Okidata OL810ex"
#: src/main/xmli18n-tmp.h:819
msgid "Okidata Okipage 6e"
-msgstr ""
+msgstr "Okidata Okipage 6e"
#: src/main/xmli18n-tmp.h:820
msgid "Okidata Okipage 6ex"
-msgstr ""
+msgstr "Okidata Okipage 6ex"
#: src/main/xmli18n-tmp.h:821
msgid "Okidata Okipage 8p"
-msgstr ""
+msgstr "Okidata Okipage 8p"
#: src/main/xmli18n-tmp.h:822
msgid "Okidata Okipage 10e"
-msgstr ""
+msgstr "Okidata Okipage 10e"
#: src/main/xmli18n-tmp.h:823
msgid "Okidata Okipage 10ex"
-msgstr ""
+msgstr "Okidata Okipage 10ex"
#: src/main/xmli18n-tmp.h:824
msgid "Okidata Okipage 14ex"
-msgstr ""
+msgstr "Okidata Okipage 14ex"
#: src/main/xmli18n-tmp.h:825
msgid "Okidata Super 6e"
-msgstr ""
+msgstr "Okidata Super 6e"
#: src/main/xmli18n-tmp.h:826
msgid "Olivetti JP350S"
-msgstr ""
+msgstr "Olivetti JP350S"
#: src/main/xmli18n-tmp.h:827
msgid "Olivetti PG 306"
-msgstr ""
+msgstr "Olivetti PG 306"
#: src/main/xmli18n-tmp.h:828
msgid "PCPI 1030"
-msgstr ""
+msgstr "PCPI 1030"
#: src/main/xmli18n-tmp.h:829
msgid "Panasonic KX-P4410"
-msgstr ""
+msgstr "Panasonic KX-P4410"
#: src/main/xmli18n-tmp.h:830
msgid "Panasonic KX-P4450"
-msgstr ""
+msgstr "Panasonic KX-P4450"
#: src/main/xmli18n-tmp.h:831
msgid "Panasonic KX-P6150"
-msgstr ""
+msgstr "Panasonic KX-P6150"
#: src/main/xmli18n-tmp.h:832
msgid "Panasonic KX-P6500"
-msgstr ""
+msgstr "Panasonic KX-P6500"
#: src/main/xmli18n-tmp.h:833
msgid "Raven LP-410"
-msgstr ""
+msgstr "Raven LP-410"
#: src/main/xmli18n-tmp.h:834
msgid "Ricoh Aficio 220"
-msgstr ""
+msgstr "Ricoh Aficio 220"
#: src/main/xmli18n-tmp.h:835
msgid "Ricoh Aficio 401"
-msgstr ""
+msgstr "Ricoh Aficio 401"
#: src/main/xmli18n-tmp.h:836
msgid "Ricoh Aficio 700"
-msgstr ""
+msgstr "Ricoh Aficio 700"
#: src/main/xmli18n-tmp.h:837
msgid "Samsung ML-85"
-msgstr ""
+msgstr "Samsung ML-85"
#: src/main/xmli18n-tmp.h:838
msgid "Samsung ML-4600"
-msgstr ""
+msgstr "Samsung ML-4600"
#: src/main/xmli18n-tmp.h:839
msgid "Samsung ML-5000a"
-msgstr ""
+msgstr "Samsung ML-5000a"
#: src/main/xmli18n-tmp.h:840
msgid "Samsung ML-6000"
-msgstr ""
+msgstr "Samsung ML-6000"
#: src/main/xmli18n-tmp.h:841
msgid "Samsung ML-6100"
-msgstr ""
+msgstr "Samsung ML-6100"
#: src/main/xmli18n-tmp.h:842
msgid "Samsung ML-7000"
-msgstr ""
+msgstr "Samsung ML-7000"
#: src/main/xmli18n-tmp.h:843
msgid "Samsung ML-7000N"
-msgstr ""
+msgstr "Samsung ML-7000N"
#: src/main/xmli18n-tmp.h:844
msgid "Samsung ML-7000P"
-msgstr ""
+msgstr "Samsung ML-7000P"
#: src/main/xmli18n-tmp.h:845
msgid "Samsung ML-7050"
-msgstr ""
+msgstr "Samsung ML-7050"
#: src/main/xmli18n-tmp.h:846
msgid "Samsung QL-5100A"
-msgstr ""
+msgstr "Samsung QL-5100A"
#: src/main/xmli18n-tmp.h:847
msgid "Samsung QL-6050"
-msgstr ""
+msgstr "Samsung QL-6050"
#: src/main/xmli18n-tmp.h:848
msgid "Seiko SpeedJET 200"
-msgstr ""
+msgstr "Seiko SpeedJET 200"
#: src/main/xmli18n-tmp.h:849
msgid "Sharp AR-161"
-msgstr ""
+msgstr "Sharp AR-161"
#: src/main/xmli18n-tmp.h:850
-#, fuzzy
msgid "Sony IJP-V100"
-msgstr "Sony UP-DP10"
+msgstr "Sony IJP-V100"
#: src/main/xmli18n-tmp.h:851
msgid "Star LS-04"
-msgstr ""
+msgstr "Star LS-04"
#: src/main/xmli18n-tmp.h:852
-#, fuzzy
msgid "Star LaserPrinter 8"
-msgstr "Setup Printer"
+msgstr "Star LaserPrinter 8"
#: src/main/xmli18n-tmp.h:853
msgid "Tally MT908"
-msgstr ""
+msgstr "Tally MT908"
#: src/main/xmli18n-tmp.h:854
msgid "Xerox Able 1406"
-msgstr ""
+msgstr "Xerox Able 1406"
#: src/main/xmli18n-tmp.h:855
msgid "Xerox DocuPrint 4508"
-msgstr ""
+msgstr "Xerox DocuPrint 4508"
#: src/main/xmli18n-tmp.h:856
msgid "Xerox DocuPrint C20"
-msgstr ""
+msgstr "Xerox DocuPrint C20"
#: src/main/xmli18n-tmp.h:857
msgid "Xerox DocuPrint N4512"
-msgstr ""
+msgstr "Xerox DocuPrint N4512"
#: src/main/xmli18n-tmp.h:858
msgid "Xerox DocuPrint N4512PS"
-msgstr ""
+msgstr "Xerox DocuPrint N4512PS"
#: src/main/xmli18n-tmp.h:859
msgid "Xerox DocuPrint P12"
-msgstr ""
+msgstr "Xerox DocuPrint P12"
#: src/main/xmli18n-tmp.h:860
msgid "Xerox DocuPrint P1202"
-msgstr ""
+msgstr "Xerox DocuPrint P1202"
#: src/main/xmli18n-tmp.h:861
msgid "Xerox DocuPrint P8e"
-msgstr ""
+msgstr "Xerox DocuPrint P8e"
#: src/main/xmli18n-tmp.h:862
msgid "Xerox Document Centre 400"
-msgstr ""
+msgstr "Xerox Document Centre 400"
#: src/main/xmli18n-tmp.h:863
msgid "Lexmark Z42"
@@ -6262,123 +5697,100 @@ msgid "Lexmark Z53"
msgstr "Lexmark Z53"
#: src/main/xmli18n-tmp.h:867
-#, fuzzy
msgid "Olympus P-10"
-msgstr "Olympus P10"
+msgstr "Olympus P-10"
#: src/main/xmli18n-tmp.h:868
-#, fuzzy
msgid "Olympus P-11"
-msgstr "Olympus P10"
+msgstr "Olympus P-11"
#: src/main/xmli18n-tmp.h:869
-#, fuzzy
msgid "Olympus P-200"
-msgstr "Olympus P200"
+msgstr "Olympus P-200"
#: src/main/xmli18n-tmp.h:870
-#, fuzzy
msgid "Olympus P-300"
-msgstr "Olympus P300"
+msgstr "Olympus P-300"
#: src/main/xmli18n-tmp.h:871
-#, fuzzy
msgid "Olympus P-300E"
-msgstr "Olympus P300"
+msgstr "Olympus P-300E"
#: src/main/xmli18n-tmp.h:872
-#, fuzzy
msgid "Olympus P-300U"
-msgstr "Olympus P300"
+msgstr "Olympus P-300U"
#: src/main/xmli18n-tmp.h:873
-#, fuzzy
msgid "Olympus P-330E"
-msgstr "Olympus P300"
+msgstr "Olympus P-330E"
#: src/main/xmli18n-tmp.h:874
-#, fuzzy
msgid "Olympus P-330NE"
-msgstr "Olympus P300"
+msgstr "Olympus P-330NE"
#: src/main/xmli18n-tmp.h:875
-#, fuzzy
msgid "Olympus P-400"
-msgstr "Olympus P400"
+msgstr "Olympus P-400"
#: src/main/xmli18n-tmp.h:876
-#, fuzzy
msgid "Olympus P-440"
-msgstr "Olympus P440"
+msgstr "Olympus P-440"
#: src/main/xmli18n-tmp.h:877
-#, fuzzy
msgid "Canon CP-100"
-msgstr "Canon CP100"
+msgstr "Canon CP-100"
#: src/main/xmli18n-tmp.h:878
-#, fuzzy
msgid "Canon CP-200"
-msgstr "Canon CP220"
+msgstr "Canon CP-200"
#: src/main/xmli18n-tmp.h:879
-#, fuzzy
msgid "Canon CP-220"
-msgstr "Canon CP220"
+msgstr "Canon CP-220"
#: src/main/xmli18n-tmp.h:880
-#, fuzzy
msgid "Canon CP-300"
-msgstr "Canon CP100"
+msgstr "Canon CP-300"
#: src/main/xmli18n-tmp.h:881
-#, fuzzy
msgid "Canon CP-330"
-msgstr "Canon CP100"
+msgstr "Canon CP-330"
#: src/main/xmli18n-tmp.h:882
-#, fuzzy
msgid "Canon SELPHY-CP-400"
-msgstr "Canon S400"
+msgstr "Canon SELPHY-CP-400"
#: src/main/xmli18n-tmp.h:883
-#, fuzzy
msgid "Canon SELPHY-CP-500"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-500"
#: src/main/xmli18n-tmp.h:884
-#, fuzzy
msgid "Canon SELPHY-CP-510"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-510"
#: src/main/xmli18n-tmp.h:885
-#, fuzzy
msgid "Canon SELPHY-CP-600"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-600"
#: src/main/xmli18n-tmp.h:886
-#, fuzzy
msgid "Canon SELPHY-CP-710"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-710"
#: src/main/xmli18n-tmp.h:887
msgid "Sony UP-DP10"
msgstr "Sony UP-DP10"
#: src/main/xmli18n-tmp.h:888
-#, fuzzy
msgid "Sony UP-DR150"
-msgstr "Sony UP-DP10"
+msgstr "Sony UP-DR150"
#: src/main/xmli18n-tmp.h:889
-#, fuzzy
msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix CX-400"
+msgstr "Fujifilm Printpix-CX-400"
#: src/main/xmli18n-tmp.h:890
-#, fuzzy
msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix CX-550"
+msgstr "Fujifilm Printpix-CX-550"
#: src/main/xmli18n-tmp.h:891
msgid "RAW DATA 16 bit"
@@ -6557,7 +5969,7 @@ msgstr "Show All Paper Sizes"
msgid "Dimensions:"
msgstr "Dimensions:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Width:"
@@ -6566,7 +5978,7 @@ msgstr "Width:"
msgid "Width of the paper that you wish to print to"
msgstr "Width of the paper that you wish to print to"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Height:"
@@ -6581,11 +5993,11 @@ msgstr "Automatic Paper Size"
#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
msgid "Number of Copies"
-msgstr ""
+msgstr "Number of Copies"
#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr ""
+msgstr "Select the number of copies to print; a value between 1 and 100"
#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
msgid "Image Position"
@@ -6836,11 +6248,11 @@ msgstr ""
"Select the name of the printer (not the type, or model, of printer) that you "
"wish to print to"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Setup Printer..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6848,11 +6260,11 @@ msgstr ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "New Printer..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6860,23 +6272,23 @@ msgstr ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
msgstr "Image Size"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Scaling:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Set the scale (size) of the image"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
-msgstr ""
+msgstr "Scale by:"
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6884,31 +6296,31 @@ msgstr ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Percent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Scale the print to the size of the page"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Scale the print to the number of dots per inch"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Set the width of the print"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Set the height of the print"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6916,65 +6328,65 @@ msgstr ""
"Use Original\n"
"Image Size"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Set the print size to the size of the image"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Print Colour Adjust"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Set Defaults"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Close"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Image preview"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr "View Output Channels:"
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr "Output"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Output Type:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Select the desired output type"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Adjust Output..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
msgstr "Size Units:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
msgstr " "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Units:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Select the base unit of measurement for printing"
@@ -7016,49 +6428,48 @@ msgid "(Default Printer)"
msgstr "(Default Printer)"
#: src/gutenprintui2/curve.c:130
-#, fuzzy
msgid "Curve type"
-msgstr " Curve"
+msgstr "Curve type"
#: src/gutenprintui2/curve.c:131
msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr ""
+msgstr "Is this curve linear, spline interpolated, or free-form"
#: src/gutenprintui2/curve.c:139
msgid "Minimum X"
-msgstr ""
+msgstr "Minimum X"
#: src/gutenprintui2/curve.c:140
msgid "Minimum possible value for X"
-msgstr ""
+msgstr "Minimum possible value for X"
#: src/gutenprintui2/curve.c:149
msgid "Maximum X"
-msgstr ""
+msgstr "Maximum X"
#: src/gutenprintui2/curve.c:150
msgid "Maximum possible X value"
-msgstr ""
+msgstr "Maximum possible X value"
#: src/gutenprintui2/curve.c:159
msgid "Minimum Y"
-msgstr ""
+msgstr "Minimum Y"
#: src/gutenprintui2/curve.c:160
msgid "Minimum possible value for Y"
-msgstr ""
+msgstr "Minimum possible value for Y"
#: src/gutenprintui2/curve.c:169
msgid "Maximum Y"
-msgstr ""
+msgstr "Maximum Y"
#: src/gutenprintui2/curve.c:170
msgid "Maximum possible value for Y"
-msgstr ""
+msgstr "Maximum possible value for Y"
#: src/gutenprintui2/gammacurve.c:418
msgid "_Gamma value"
-msgstr ""
+msgstr "_Gamma value"
#: src/cups/genppd.c:133
msgid "Printer Features"
@@ -7092,28 +6503,27 @@ msgstr "Extra 4"
msgid "Extra 5"
msgstr "Extra 5"
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-msgid "Gutenprint"
-msgstr "Gutenprint"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "English-GB"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "UTF-8"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr "No"
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr "Yes"
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr "Fine Adjustment"
@@ -7122,20 +6532,18 @@ msgid "Escputil version "
msgstr "Escputil version "
#: src/escputil/escputil.c:71
-#, fuzzy
msgid ""
", Copyright (C) 2000-2006 Robert Krawitz\n"
"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; type 'escputil -l' for details.\n"
msgstr ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright © 2000-2006 Robert Krawitz\n"
"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; type 'escputil -l' for details.\n"
#: src/escputil/escputil.c:76
-#, fuzzy
msgid ""
"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
@@ -7153,24 +6561,23 @@ msgid ""
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
+"under the terms of the GNU General Public Licence as published by the Free\n"
+"Software Foundation; either version 2 of the Licence, or (at your option)\n"
"any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful, but\n"
"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n"
+"or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licence\n"
"for more details.\n"
"\n"
-"You should have received a copy of the GNU General Public License\n"
+"You should have received a copy of the GNU General Public Licence\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
#: src/escputil/escputil.c:119
-#, fuzzy
msgid ""
"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
" [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -7215,11 +6622,12 @@ msgid ""
" -C|--choices Specify the number of pattern choices for alignment\n"
" -p|--patterns Specify the number of sets of patterns for alignment\n"
msgstr ""
-"Usage: escputil [-c | -n | -a | -i | -s | -d | -l | -M]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
" [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --clean-head --printer stpex-on-third-floor\n"
-" escputil --ink-level --new --raw-device /dev/lp0\n"
+" [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus ® printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+" escputil --clean-head --new --printer-name MyQueue\n"
"\n"
" Commands:\n"
" -c|--clean-head Clean the print head.\n"
@@ -7234,10 +6642,13 @@ msgstr ""
" -i|--ink-level Obtain the ink level from the printer. This "
"requires\n"
" read/write access to the raw printer device.\n"
+" -e|--extended-ink-info Obtain the extended ink information from the\n"
+" printer. This requires read/write access to the raw\n"
+" printer device.\n"
" -d|--identify Query the printer for make and model information.\n"
" This requires read/write access to the raw printer\n"
" device.\n"
-" -l|--license Display the licence/warranty terms of this program.\n"
+" -l|--license Display the license/warranty terms of this program.\n"
" -M|--list-models List the available printer models.\n"
" -h|--help Print this help message.\n"
" Options:\n"
@@ -7246,14 +6657,15 @@ msgstr ""
" -r|--raw-device Specify the name of the device to write to directly\n"
" rather than going through a printer queue.\n"
" -u|--new The printer is a new printer (Stylus Color 740 or\n"
-" newer).\n"
+" newer). Only needed when not using a raw device.\n"
" -q|--quiet Suppress the banner.\n"
" -S|--short-name Print the short name of the printer with --identify.\n"
" -m|--model Specify the precise printer model for head "
"alignment.\n"
+" -C|--choices Specify the number of pattern choices for alignment\n"
+" -p|--patterns Specify the number of sets of patterns for alignment\n"
#: src/escputil/escputil.c:161
-#, fuzzy
msgid ""
"Usage: escputil [OPTIONS] [COMMAND]\n"
"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7297,11 +6709,12 @@ msgid ""
" -p Specify the number of sets of patterns for alignment\n"
msgstr ""
"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -s | -d | -l | -M]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
" [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -c -P stpex-on-third-floor\n"
-" escputil -i -u -r /dev/lp0\n"
+" [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus ® printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+" escputil -c -u -P MyQueue\n"
"\n"
" Commands:\n"
" -c Clean the print head.\n"
@@ -7315,9 +6728,12 @@ msgstr ""
" -s Retrieve printer status.\n"
" -i Obtain the ink level from the printer. This requires\n"
" read/write access to the raw printer device.\n"
+" -e Obtain the extended ink information from the printer.\n"
+" Only for R800 printer and friends. This requires\n"
+" read/write access to the raw printer device.\n"
" -d Query the printer for make and model information. This\n"
" requires read/write access to the raw printer device.\n"
-" -l Display the licence/warranty terms of this program.\n"
+" -l Display the license/warranty terms of this program.\n"
" -M List the available printer models.\n"
" -h Print this help message.\n"
" Options:\n"
@@ -7326,9 +6742,12 @@ msgstr ""
" -r Specify the name of the device to write to directly\n"
" rather than going through a printer queue.\n"
" -u The printer is a new printer (Stylus Color 740 or newer).\n"
+" Only needed when not using a raw device.\n"
" -q Suppress the banner.\n"
" -S Print the short name of the printer with -d.\n"
" -m Specify the precise printer model for head alignment.\n"
+" -C Specify the number of pattern choices for alignment\n"
+" -p Specify the number of sets of patterns for alignment\n"
#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
#, c-format
@@ -7343,12 +6762,12 @@ msgstr "You may only specify one printer model."
#: src/escputil/escputil.c:369
#, c-format
msgid "Alignment choices must be at least 1."
-msgstr ""
+msgstr "Alignment choices must be at least 1."
#: src/escputil/escputil.c:376
#, c-format
msgid "Alignment passes must be at least 1."
-msgstr ""
+msgstr "Alignment passes must be at least 1."
#: src/escputil/escputil.c:381
#, c-format
@@ -7358,17 +6777,17 @@ msgstr "Unknown option %c\n"
#: src/escputil/escputil.c:389
#, c-format
msgid "Usage: %s [OPTIONS] command\n"
-msgstr ""
+msgstr "Usage: %s [OPTIONS] command\n"
#: src/escputil/escputil.c:391
#, c-format
msgid "Type `%s --help' for more information.\n"
-msgstr ""
+msgstr "Type `%s --help' for more information.\n"
#: src/escputil/escputil.c:393
#, c-format
msgid "Type `%s -h' for more information.\n"
-msgstr ""
+msgstr "Type `%s -h' for more information.\n"
#: src/escputil/escputil.c:459
#, c-format
@@ -7395,19 +6814,23 @@ msgstr "Read from printer timed out\n"
msgid "Cannot read from %s: %s\n"
msgstr "Cannot read from %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Cannot open %s read/write: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Cannot write to %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7416,7 +6839,7 @@ msgstr ""
"\n"
"Cannot write to %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7427,225 +6850,224 @@ msgstr ""
"Cannot detect printer type.\n"
"Please use -m to specify your printer model.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
-msgstr ""
+msgstr "Status: Error\n"
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
-msgstr ""
+msgstr "Status: Self-Printing\n"
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
-msgstr ""
+msgstr "Status: Busy\n"
-#: src/escputil/escputil.c:1020
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1036
+#, c-format
msgid "Status: Waiting\n"
-msgstr "Saturation"
+msgstr "Status: Waiting\n"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
-msgstr ""
+msgstr "Status: Idle\n"
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
-msgstr ""
+msgstr "Status: Paused\n"
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
-msgstr ""
+msgstr "Status: Cleaning\n"
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
-msgstr ""
+msgstr "Status: Factory shipment\n"
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
-msgstr ""
+msgstr "Status: Shutting down\n"
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
-msgstr ""
+msgstr "Status: Unknown (%d)\n"
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
-msgstr ""
+msgstr "Error: Fatal Error\n"
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
-msgstr ""
+msgstr "Error: Other interface is selected\n"
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
-msgstr ""
+msgstr "Error: Cover Open\n"
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
-msgstr ""
+msgstr "Error: Paper jam\n"
-#: src/escputil/escputil.c:1061
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1077
+#, c-format
msgid "Error: Ink out\n"
-msgstr "Error in input\n"
+msgstr "Error: Ink out\n"
-#: src/escputil/escputil.c:1064
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1080
+#, c-format
msgid "Error: Paper out\n"
-msgstr "Error in input\n"
+msgstr "Error: Paper out\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
-msgstr ""
+msgstr "Error: Wait return from the tear-off position\n"
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
-msgstr ""
+msgstr "Error: Double feed error\n"
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
-msgstr ""
+msgstr "Error: Unrecoverable cutter error\n"
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
-msgstr ""
+msgstr "Error: Recoverable cutter jam\n"
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
-msgstr ""
+msgstr "Error: CD Tray Out\n"
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
-msgstr ""
+msgstr "Error: Card loading error\n"
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
-msgstr ""
+msgstr "Error: Tray cover open\n"
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
-msgstr ""
+msgstr "Error: Unknown (%d)\n"
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
-msgstr ""
+msgstr "Printing nozzle self-test\n"
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
-msgstr ""
+msgstr "Ink Levels:\n"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Ink colour"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Percent remaining"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
-msgstr ""
+msgstr "Warning: Black Ink Low\n"
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
-msgstr ""
+msgstr "Warning: Unknown (%d)\n"
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
-msgstr ""
+msgstr "Job Name: "
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
-msgstr ""
+msgstr "ink levels"
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
-msgstr ""
+msgstr "status"
-#: src/escputil/escputil.c:1339
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1355
+#, c-format
msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Obtaining ink levels requires using a raw device.\n"
+msgstr "Obtaining %s requires using a raw device.\n"
-#: src/escputil/escputil.c:1451
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1461
+#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Obtaining ink levels requires using a raw device.\n"
+msgstr "Obtaining extended ink information requires using a raw device.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
-msgstr ""
+msgstr "Part number"
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-#, fuzzy
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
-msgstr "Draft"
+msgstr "Date"
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Printer identification requires using a raw device.\n"
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1693
+#, c-format
msgid "Cannot identify printer model.\n"
-msgstr "You may only specify one printer model."
+msgstr "Cannot identify printer model.\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Cleaning heads...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr "Running nozzle check, please ensure paper is in the printer.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7718,7 +7140,7 @@ msgstr ""
"It is essential that you not turn your printer off during this procedure.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7785,17 +7207,17 @@ msgstr ""
"this procedure.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Unable to send command to the printer, exiting.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
-msgstr ""
+msgstr "Exiting\n"
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7814,20 +7236,20 @@ msgstr ""
"You will then be asked to confirm your choice.\n"
"What do you want to do (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7836,7 +7258,7 @@ msgstr ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
"If you wish to save the alignment, you must repeat this process.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7845,12 +7267,12 @@ msgstr ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Repeating the alignment process.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7865,17 +7287,17 @@ msgstr ""
"Please confirm by typing 's' again that you wish to save the settings\n"
"to your printer:\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "About to save settings..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "failed!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7884,27 +7306,27 @@ msgstr ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "succeeded!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Your alignment settings have been saved to the printer.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Unrecognised command.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Final command was not confirmed.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7921,12 +7343,12 @@ msgstr ""
"Please place a sheet of paper in your printer to begin the head\n"
"alignment procedure.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Press enter to continue > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7937,42 +7359,42 @@ msgstr ""
"pattern.\n"
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Pass #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Please insert a fresh sheet of paper.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Number out of range!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "I cannot understand what you typed!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "The best pair of lines should be numbered between 1 and %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Attempting to set alignment..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "succeeded.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7985,7 +7407,7 @@ msgstr ""
"pattern %d. If it is not, you should repeat the process to get the best\n"
"quality printing.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Error in input\n"
@@ -7994,7 +7416,7 @@ msgstr "Error in input\n"
msgid "Printing..."
msgstr "Printing..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/File/Print..."
@@ -8009,221 +7431,117 @@ msgid ""
"ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
"not match the PPD file (%s).\n"
msgstr ""
+"ijsgutenprint: the version of Gutenprint software installed (%s)\n"
+" does not match the PPD file (%s). If you have upgraded your version\n"
+" of Gutenprint recently, you must reinstall all printer queues.\n"
+" Please refer to your vendor's documentation or the ``foomatic-ppdfile''\n"
+" command for instructions.\n"
+"ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
+"not match the PPD file (%s).\n"
-#: src/ghost/ijsgutenprint.c:190
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:191
+#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "Bad colour space: bps %d channels %d space %s\n"
+msgstr "ERROR: ijsgutenprint: Bad colour space: bps %d channels %d space %s\n"
-#: src/ghost/ijsgutenprint.c:198
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:199
+#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "No row buffer\n"
+msgstr "ERROR: ijsgutenprint: No row buffer\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
+#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Unable to parse parameter %s=%s (expect a number)\n"
+msgstr ""
+"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-#: src/ghost/ijsgutenprint.c:497
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:498
+#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "Printer must be specified with -sModel\n"
+msgstr "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-#: src/ghost/ijsgutenprint.c:499
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:500
+#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "Printer %s is not a known model\n"
+msgstr "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
-msgstr ""
+msgstr "ijsgutenprint: unknown DeviceModel %s\n"
-#: src/ghost/ijsgutenprint.c:699
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:700
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-#: src/ghost/ijsgutenprint.c:722
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:723
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-#: src/ghost/ijsgutenprint.c:794
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:795
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse curve %s\n"
-#: src/ghost/ijsgutenprint.c:801
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:802
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-#: src/ghost/ijsgutenprint.c:808
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:809
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-#: src/ghost/ijsgutenprint.c:815
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:816
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-#: src/ghost/ijsgutenprint.c:829
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:830
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+msgstr "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-#: src/ghost/ijsgutenprint.c:840
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:841
+#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Unknown type parameter %s (%d)\n"
+msgstr "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-#: src/ghost/ijsgutenprint.c:866
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:867
+#, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Get next row failed at %.0f\n"
+msgstr "ERROR: ijsgutenprint: bad key code %d\n"
-#: src/ghost/ijsgutenprint.c:1303
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1308
+#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "image_init failed %d\n"
+msgstr "ERROR: ijsgutenprint: image_init failed %d\n"
-#: src/ghost/ijsgutenprint.c:1314
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1319
+#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Unable to open file descriptor: %s\n"
+msgstr "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1331
+#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Unable to open %s: %s\n"
+msgstr "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1344
+#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "Unknown printer %s\n"
+msgstr "ERROR: ijsgutenprint: Unknown printer %s\n"
-#: src/ghost/ijsgutenprint.c:1508
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1516
+#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Bad parameters; cannot continue!\n"
+msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-#: src/ghost/ijsgutenprint.c:1526
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1534
+#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Get next row failed at %.0f\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "ijs_server_get_page_header failed %d\n"
-
-#~ msgid "Canon BJC 4400 photo"
-#~ msgstr "Canon BJC 4400 photo"
-
-#, fuzzy
-#~ msgid "Canon PIXMA iP4000"
-#~ msgstr "Canon S400"
-
-#~ msgid "EPSON Stylus Photo 785EPX"
-#~ msgstr "EPSON Stylus Photo 785EPX"
-
-#~ msgid "EPSON CL-700"
-#~ msgstr "EPSON CL-700"
-
-#~ msgid "EPSON CL-750"
-#~ msgstr "EPSON CL-750"
-
-#~ msgid "EPSON CL-760"
-#~ msgstr "EPSON CL-760"
-
-#, fuzzy
-#~ msgid "EPSON E-100"
-#~ msgstr "EPSON EM-900C"
-
-#~ msgid "EPSON MC-2000"
-#~ msgstr "EPSON MC-2000"
-
-#~ msgid "EPSON MC-7000"
-#~ msgstr "EPSON MC-7000"
-
-#~ msgid "EPSON MC-10000"
-#~ msgstr "EPSON MC-10000"
-
-#~ msgid "EPSON MJ-6000C"
-#~ msgstr "EPSON MJ-6000C"
-
-#~ msgid "HP DeskJet 600/600C"
-#~ msgstr "HP DeskJet 600/600C"
-
-#~ msgid "HP DeskJet 600 series"
-#~ msgstr "HP DeskJet 600 series"
-
-#~ msgid "HP DeskJet 690 series"
-#~ msgstr "HP DeskJet 690 series"
-
-#~ msgid "HP DeskJet 900 series"
-#~ msgstr "HP DeskJet 900 series"
-
-#~ msgid "HP DeskJet 2000 series"
-#~ msgstr "HP DeskJet 2000 series"
-
-#~ msgid "HP DeskJet 2500 series"
-#~ msgstr "HP DeskJet 2500 series"
-
-#~ msgid "HP LaserJet II series"
-#~ msgstr "HP LaserJet II series"
-
-#~ msgid "HP LaserJet III series"
-#~ msgstr "HP LaserJet III series"
-
-#~ msgid "HP LaserJet 4 series"
-#~ msgstr "HP LaserJet 4 series"
-
-#~ msgid "HP LaserJet 5 series"
-#~ msgstr "HP LaserJet 5 series"
-
-#~ msgid "HP LaserJet 6 series"
-#~ msgstr "HP LaserJet 6 series"
-
-#, fuzzy
-#~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "This printer does not support raw printer output at depth %d\n"
-
-#, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Cannot parse output from printer\n"
-
-#~ msgid "Red Balance"
-#~ msgstr "Red Balance"
-
-#~ msgid "Blue Balance"
-#~ msgstr "Blue Balance"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Printer status requires using a raw device.\n"
-
-#~ msgid "Gloss Balance"
-#~ msgstr "Gloss Balance"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Attempting to detect printer model..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Printer model %s is not known.\n"
+msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
diff --git a/po/es.gmo b/po/es.gmo
index 52d9a66..d1ba5de 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index f131422..fe795a6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2002-04-29 00:38GMT\n"
"Last-Translator: Gustavo D. Vranjes <gvranjes@abaconet.com.ar>\n"
"Language-Team: Castellano <es@li.org>\n"
@@ -15,8 +15,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0beta1\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Establecer por Omisión"
@@ -31,70 +33,73 @@ msgstr "Sobre"
msgid "Hybrid EvenTone"
msgstr "Sobre"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Carta"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "Sobre"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "Sobre"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Híbrido Adaptativo"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordenado"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Rápido"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Muy Rápido"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Floyd-Steinberg Híbrido"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Densidad:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -104,15 +109,15 @@ msgstr ""
"la tinta se difumina sobre el papel; aumentar la densidad si las regiones "
"negras no son sólidas."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Algoritmo de Entramado"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
#, fuzzy
msgid ""
"Choose the dither algorithm to be used.\n"
@@ -359,7 +364,7 @@ msgstr "Otro"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Tamaño"
@@ -375,61 +380,61 @@ msgstr "Tamaño"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Configuración de la Impresora"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Tamaño del papel al que desea imprimir"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Tipo de Medio"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Fuente de Medio"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Resolución"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Resolución y calidad de la impresión"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Tipo de Tinta"
@@ -437,22 +442,22 @@ msgstr "Tipo de Tinta"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Tipo de tinta de la impresora"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -462,13 +467,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Modelo de Impresora:"
@@ -477,97 +482,97 @@ msgstr "Modelo de Impresora:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Papel Común"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Densidad:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Ajustar el balance de cian de la impresión"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Ajusta el balance magenta de la impresión"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Densidad:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Ajusta el balance amarillo de la impresión"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Densidad:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Ajustar el balance de cian de la impresión"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Cian Claro"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Magenta Claro"
@@ -577,13 +582,13 @@ msgstr "Magenta Claro"
msgid "Light Yellow Transition"
msgstr "Cian Claro"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -625,28 +630,28 @@ msgid "CMY Color"
msgstr "Color CMY (Cian/Mag/Amar)"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Negro"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Color"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Blanco y Negro"
@@ -848,15 +853,15 @@ msgstr "Gamma:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cian"
@@ -865,15 +870,15 @@ msgstr "Cian"
msgid "Adjust the cyan gamma"
msgstr "Ajustar el balance de cian de la impresión"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -882,15 +887,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr "Ajusta el balance magenta de la impresión"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Amarillo"
@@ -899,10 +904,10 @@ msgstr "Amarillo"
msgid "Adjust the yellow gamma"
msgstr "Ajusta el balance amarillo de la impresión"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -911,7 +916,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Ajusta el balance amarillo de la impresión"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -921,10 +926,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Ajusta el balance magenta de la impresión"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1255,173 +1260,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Estándar"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Alimentación por Rollo"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Manual"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "¿Imprimir a un archivo?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Manual"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Manual"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Bandeja"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Papel para Fotografía"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "Autoseleccionar"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Altura:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Fotografía"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Fotografía de Seis Colores"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "Cian Claro"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Magenta Claro"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Negro"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Amarillo"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Papel Opaco"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Papel para Fotografía"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Película Brillante"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Negro"
@@ -1609,138 +1614,139 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Ajusta el balance amarillo de la impresión"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Densidad:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Ajusta el balance amarillo de la impresión"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Densidad:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Ajustar el balance de cian de la impresión"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Película Brillante"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Ajusta el balance amarillo de la impresión"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Cian Claro"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Cian Claro"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Cian Claro"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Cian Claro"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Tipo de salida:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "¿Imprimir a un archivo?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Tipo de salida:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Tamaño"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 PPP Unidireccional"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 PPP Unidireccional"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "La impresora no soporta salida de color\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1900,8 +1906,8 @@ msgstr "Papel Pesado Ilford"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2025,24 +2031,24 @@ msgstr "600x600 PPP monocromo"
msgid "2400x600 DPI"
msgstr "2400x600 PPP"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Cartuchos Negro + Color"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Cartuchos Color + Fotografía"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "Archivo PPD:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5860,51 +5866,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6414,7 +6420,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Dimensiones:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Ancho:"
@@ -6423,7 +6429,7 @@ msgstr "Ancho:"
msgid "Width of the paper that you wish to print to"
msgstr "Ancho del papel al que desea imprimir"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Altura:"
@@ -6710,11 +6716,11 @@ msgstr ""
"Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
"que desea imprimir"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Conf. Impresora..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6722,11 +6728,11 @@ msgstr ""
"Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
"imprimir a ésta impresora"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Impresora Nueva..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6734,24 +6740,24 @@ msgstr ""
"Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una "
"colección de configuraciones que usted desea recordar para uso futuro."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Tamaño"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Escala:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Establecer la escala (el tamaño) de la imagen"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr "Escalar por:"
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6759,31 +6765,31 @@ msgstr ""
"Seleccionar si la escala se mide como porcentaje de la medida del papel "
"disponible o número de puntos por pulgada en la salida."
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Porcentaje"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Redimensionar la impresión al tamaño de la página"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPP"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Establecer el ancho de la impresión"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Establecer el alto de la impresión"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6791,69 +6797,69 @@ msgstr ""
"Usar Medida Orig.\n"
"de la Imagen"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Establecer la medida de impresión a la medida de la imagen"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Ajuste de Impresión en Color"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Establecer por Omisión"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Cerrar"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Vista previa de imagen"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Tipo de salida:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Tipo de salida:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Seleccionar el tipo de salida deseado"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Ajustar Salida..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Ajustar balance de color, brillo, contraste, saturacion, y algoritmo de "
"entramado"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Unidades:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Unidades:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Seleccionar la unidad base de medida para imprimir"
@@ -6980,29 +6986,27 @@ msgstr "Bandeja 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "prueba de impresión"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Spanish"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7301,19 +7305,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "No puedo leer %s de: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "No puedo abrir %s para lectura/escritura: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "No puedo escribir a %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7322,7 +7330,7 @@ msgstr ""
"\n"
"No puedo escribir a %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7333,229 +7341,229 @@ msgstr ""
"No puedo detectar el tipo de impresora.\n"
"Favor de usar -m para especificar su modelo de impresora.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Saturación:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "Error en entrada\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "Error en entrada\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Color de tinta"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Porcentaje restante"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr ""
"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr ""
"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
"La identificación de la impresora requiere el uso de un dispositivo crudo.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Usted sólo puede especificar un modelo de impresora"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Limpiando inyectores...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
"Ejecutando la prueba de los inyectores de tinta, favor de asegurarse que "
"haya papel en la impresora.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7634,7 +7642,7 @@ msgstr ""
"durante éste proceso.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7706,17 +7714,17 @@ msgstr ""
"durante éste proceso.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "No puedo enviar comando a la impresora, saliendo.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7735,13 +7743,13 @@ msgstr ""
"Luego le será requerido confirmar su elección.\n"
"¿Qué opción elige? (s), (q), (r).\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -7749,7 +7757,7 @@ msgstr ""
"Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
"guardar:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7758,7 +7766,7 @@ msgstr ""
"Bien, su impresora está alineada, pero la alineación no fue guardada.\n"
"Si quiere guardar la alineación, deberá repetir éste proceso.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7767,12 +7775,12 @@ msgstr ""
"Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
"proceso de alineado:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Repitiendo el proceso de alineación.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7787,17 +7795,17 @@ msgstr ""
"Favor de confirmar que desea guardar la configuración de su impresora\n"
"tipeando 's' de nuevo.\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "Acerca de guardar configuración..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "¡falló!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7806,27 +7814,27 @@ msgstr ""
"Su configuración no fue guardada exitosamente. Debe repetir el\n"
"proceso de alineación.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "¡éxito!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Su configuración de alineación fue guardada a la impresora.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Comando no reconocido.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "El comando final no fue confirmado.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7843,12 +7851,12 @@ msgstr ""
"Favor de poner una hoja de papel en la impresora para comenzar el\n"
"procedimiento de alineación del cabezal.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Presione enter para continuar > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7859,42 +7867,42 @@ msgstr ""
"patrón.\n"
"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Pasar #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Favor de insertar una hoja de papel sin imprimir.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "¡Número fuera de rango!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "¡No puedo entender lo que usted ha tipeado!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "El mejor par de líneas debe ser numerado entre 1 y %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Intentando definir alineación..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "éxito.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7907,7 +7915,7 @@ msgstr ""
"para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
"obtener la mejor calidad de impresión.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Error en entrada\n"
@@ -7916,7 +7924,7 @@ msgstr "Error en entrada\n"
msgid "Printing..."
msgstr "Imprimiendo..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Archivo/Imprimir..."
@@ -7932,113 +7940,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "Mal espacio de color: bps %d canales %d espacio %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Sin buffer de filas\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "No puedo analizar el parámetro %s=%s (se espera un número)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "La impresora debe ser especificada con -sModel\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "La impresora %s no es un modelo conocido\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "No puedo imprimir a impresora %s con %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Impresora desconocida %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Traer próxima fila falló en %d\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "falló image_init %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "No puedo abrir el descriptor de archivo: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "No puedo abrir %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Impresora desconocida %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "¡Parámetros malos, no puedo continuar!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Traer próxima fila falló en %d\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "prueba de impresión"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "Traer próxima fila falló en %d\n"
@@ -8350,10 +8362,6 @@ msgstr "Traer próxima fila falló en %d\n"
#~ msgid "Red Balance"
#~ msgstr "Ajusta el balance amarillo de la impresión"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr ""
-#~ "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "Ajusta el balance amarillo de la impresión"
diff --git a/po/fr.gmo b/po/fr.gmo
index c5da61c..e92db66 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index 61d9791..b1708f7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,98 +1,102 @@
# French translation of gimp-print.
+# French translation of gutenprint
# Copyright (C) 2000-2002 Free Software Foundation, Inc.
# Christophe Merlet (RedFox) <christophe@merlet.net>, 2000-2002.
# Christophe Fergeau <teuf@users.sourceforge.net>, 2001.
# Raymond Ostertag <r.ostertag@caramail.com>, 2002.
-#
+# Regis Rampnoux <regisr@pobox.com>, 2005.
msgid ""
msgstr ""
-"Project-Id-Version: gimp-print 4.2.1-pre4\n"
+"Project-Id-Version: gimp-print 5.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
-"PO-Revision-Date: 2006-05-13 21:08-0400\n"
-"Last-Translator: Olivier Poulet <opoulet@hispeed-sr.ch>\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"PO-Revision-Date: 2006-05-28 10:05-0400\n"
+"Last-Translator: regis rampnoux <regisr@pobox.com>\n"
"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
-msgstr "Valeurs par défaut"
+msgstr "Défaut"
#: src/main/dither-main.c:47
msgid "EvenTone"
-msgstr "Tons lisses"
+msgstr "EvenTone"
#: src/main/dither-main.c:48
-#, fuzzy
msgid "Hybrid EvenTone"
-msgstr "Tons lisses"
+msgstr "Hybride EvenTone"
-#: src/main/dither-main.c:54
-#, fuzzy
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
-msgstr "Letter"
+msgstr "EvenBetter"
-#: src/main/dither-main.c:55
-#, fuzzy
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
-msgstr "Tons lisses"
+msgstr "Hybride EvenBetter"
-#: src/main/dither-main.c:61
-#, fuzzy
+#: src/main/dither-main.c:60
msgid "UniTone"
-msgstr "Tons lisses"
+msgstr "UniTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
-msgstr ""
+msgstr "Hybride Unitone"
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
-msgstr "Adaptatif Hybride"
+msgstr "Adaptatif hybride"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordonné"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Rapide"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Très rapide"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
-msgstr "Floyd-Steinberg Hybride"
+msgstr "Floyd-Steinberg hybride"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
-msgstr ""
+msgstr "Pré tramé"
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
msgstr "Densité"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
-msgstr ""
+msgstr "Réglage du niveau de sortie"
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -102,15 +106,15 @@ msgstr ""
"densité si l'encre bave sur le papier ou fait des taches; augmentez la "
"densité si les régions noires ne sont pas pleines."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Algorithme de tramage"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -122,19 +126,16 @@ msgid ""
"Hybrid Floyd-Steinberg generally produces inferior output."
msgstr ""
"Choisissez l'algorithme de tramage à utiliser.\n"
-"Adaptatif Hybride produit habituellement la meilleure qualité de tous.\n"
-"EvenTone est un nouvel algorithme expérimental qui produit souvent "
-"d'excellents résultats.\n"
-"Ordonné est plus rapide et produit une qualité presque aussi bonne pour les "
-"photographies.\n"
-"Rapide et Très Rapide sont considérablement nettement plus rapides et "
-"fonctionnent\n"
-"bien pour du texte ou des tracés.\n"
+"Adaptative Hybride produit habituellement la meilleure qualité de tous.\n"
+"Ordonné est plus rapide et produit une qualité presque aussi bonne que les "
+"photographes.\n"
+"Rapide et Très Rapide sont considérablement rapudes et fonctionne bien pour "
+"du text ou des tracés.\n"
"Floyd-Steinberg Hybride produit généralement des sorties inférieures."
#: src/main/module.c:52
msgid "Miscellaneous (unclassified)"
-msgstr "Divers (non classifiés)"
+msgstr "Divers (sans catégorie)"
#: src/main/module.c:53
msgid "Family driver"
@@ -142,143 +143,142 @@ msgstr ""
#: src/main/module.c:54
msgid "Color conversion module"
-msgstr "Module de conversion couleur"
+msgstr "Module de conversion de couleur"
#: src/main/module.c:55
-#, fuzzy
msgid "Dither algorithm"
msgstr "Algorithme de tramage"
#: src/main/print-canon.c:1382
msgid "90x90 DPI"
-msgstr "90x90 ppp"
+msgstr "90x90 PPP"
#: src/main/print-canon.c:1382
msgid "90x90 DPI DMT"
-msgstr "90x90 ppp DMT"
+msgstr "90x90 PPP DMT"
#: src/main/print-canon.c:1383
msgid "180x180 DPI"
-msgstr "180x180 ppp"
+msgstr "180x180 PPP"
#: src/main/print-canon.c:1383
msgid "180x180 DPI DMT"
-msgstr "180x180 ppp DMT"
+msgstr "180x180 PPP DMT"
#: src/main/print-canon.c:1384
msgid "360x360 DPI"
-msgstr "360x360 ppp"
+msgstr "360x360 PPP"
#: src/main/print-canon.c:1384
msgid "360x360 DPI DMT"
-msgstr "360x360 ppp DMT"
+msgstr "360x360 PPP DMT"
#: src/main/print-canon.c:1385
msgid "720x360 DPI"
-msgstr "720x360 ppp"
+msgstr "720x360 PPP"
#: src/main/print-canon.c:1385
msgid "720x360 DPI DMT"
-msgstr "720x360 ppp DMT"
+msgstr "720x360 PPP DMT"
#: src/main/print-canon.c:1386
msgid "720x720 DPI"
-msgstr "720x720 ppp"
+msgstr "720x720 PPP"
#: src/main/print-canon.c:1386
msgid "720x720 DPI DMT"
-msgstr "720x720 ppp DMT"
+msgstr "720x720 PPP DMT"
#: src/main/print-canon.c:1387
msgid "1440x720 DPI"
-msgstr "1440x720 ppp"
+msgstr "1440x720 PPP"
#: src/main/print-canon.c:1387
msgid "1440x720 DPI DMT"
-msgstr "1440x720 ppp DMT"
+msgstr "1440x720 PPP DMT"
#: src/main/print-canon.c:1388
msgid "1440x1440 DPI"
-msgstr "1440x1440 ppp"
+msgstr "1440x1440 PPP"
#: src/main/print-canon.c:1388
msgid "1440x1440 DPI DMT"
-msgstr "1440x1440 ppp DMT"
+msgstr "1440x1440 PPP DMT"
#: src/main/print-canon.c:1389
msgid "2880x2880 DPI"
-msgstr "2880x2880 ppp"
+msgstr "2880x2880 PPP"
#: src/main/print-canon.c:1389
msgid "2880x2880 DPI DMT"
-msgstr "2880x2880 ppp DMT"
+msgstr "2880x2880 PPP DMT"
#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
msgid "150x150 DPI"
-msgstr "150 x 150 ppp"
+msgstr "150x150 PPP"
#: src/main/print-canon.c:1390
msgid "150x150 DPI DMT"
-msgstr "150x150 ppp DMT"
+msgstr "150x150 PPP DMT"
#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
msgid "300x300 DPI"
-msgstr "300 x 300 ppp"
+msgstr "300x300 PPP"
#: src/main/print-canon.c:1391
msgid "300x300 DPI DMT"
-msgstr "300x300 ppp DMT"
+msgstr "300x300 PPP DMT"
#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
msgid "600x300 DPI"
-msgstr "600 x 300 ppp"
+msgstr "600x300 PPP"
#: src/main/print-canon.c:1392
msgid "600x300 DPI DMT"
-msgstr "600x300 ppp DMT"
+msgstr "600x300 PPP DMT"
#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
msgid "600x600 DPI"
-msgstr "600 x 600 ppp"
+msgstr "600x600 PPP"
#: src/main/print-canon.c:1393
msgid "600x600 DPI DMT"
-msgstr "600x600 ppp DMT"
+msgstr "600x600 PPP DMT"
#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
msgid "1200x600 DPI"
-msgstr "1200 x 600 ppp"
+msgstr "1200x600 PPP"
#: src/main/print-canon.c:1394
msgid "1200x600 DPI DMT"
-msgstr "1200x600 ppp DMT"
+msgstr "1200x600 PPP DMT"
#: src/main/print-canon.c:1395
msgid "1200x1200 DPI"
-msgstr "1200x1200 ppp"
+msgstr "1200x1200 PPP"
#: src/main/print-canon.c:1395
msgid "1200x1200 DPI DMT"
-msgstr "1200x1200 ppp DMT"
+msgstr "1200x1200 PPP DMT"
#: src/main/print-canon.c:1396
msgid "2400x2400 DPI"
-msgstr "2400x2400 ppp"
+msgstr "2400x2400 PPP"
#: src/main/print-canon.c:1396
msgid "2400x2400 DPI DMT"
-msgstr "2400x2400 ppp DMT"
+msgstr "2400x2400 PPP DMT"
#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
msgid "Plain Paper"
-msgstr "Papier normal"
+msgstr "Papier ordinaire"
#: src/main/print-canon.c:1448
msgid "Plain Paper PIXMA"
-msgstr "Papier normal PIXMA"
+msgstr "Papier PIXMA"
#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
@@ -293,7 +293,7 @@ msgstr "Film back print"
#: src/main/print-canon.c:1451
msgid "Fabric Sheets"
-msgstr "Feuilles de fabrique"
+msgstr "Support tissu"
#: src/main/print-canon.c:1452
msgid "Envelope"
@@ -309,19 +309,19 @@ msgstr "Transferts T-Shirt"
#: src/main/print-canon.c:1455
msgid "High Gloss Film"
-msgstr "Film glacé"
+msgstr "Film très brillant"
#: src/main/print-canon.c:1456
msgid "Glossy Photo Paper"
-msgstr "Papier glacé qualité photo"
+msgstr "Papier brillant qualité photo"
#: src/main/print-canon.c:1457
msgid "Glossy Photo Cards"
-msgstr "Cartes glacées qualité photo"
+msgstr "Cartes brillantes qualité photo"
#: src/main/print-canon.c:1458
msgid "Photo Paper Pro"
-msgstr "Papier photo pro"
+msgstr "Papier Photo Pro"
#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
@@ -333,9 +333,9 @@ msgstr "Autre"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
-msgstr "Taille de page"
+msgstr "Format papier "
#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
@@ -348,58 +348,58 @@ msgstr "Taille de page"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
-msgstr "Paramètres de l'imprimante"
+msgstr "Configuration de base de l'imprimante"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
-msgstr "Taille du papier sur lequel vous souhaitez imprimer"
+msgstr "Taille du papier sur lequel vous imprimez"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Type de support"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
-msgstr "Type de média (papier normal, papier photo, etc.)"
+msgstr "Type de support (papier ordinaire, papier photo etc.)"
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Source du support"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr "Source (bac) du support vers lequel vous imprimez"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Résolution"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Résolution et qualité de l'impression"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Type d'encre"
@@ -407,24 +407,24 @@ msgstr "Type d'encre"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
-msgstr "Configuration d'imprimante avancée"
+msgstr "Réglages imprimante avancés"
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
-msgstr "Type d'encre dans l'imprimante"
+msgstr "Encres installées"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
-msgstr ""
+msgstr "Encres (canaux)"
#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
@@ -432,123 +432,121 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
-msgstr "Fonctionalités avancées de l'imprimante"
+msgstr "Fonctionalités avancées"
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
-msgstr "Mode d'impression:"
+msgstr "Mode d'impression"
#: src/main/print-canon.c:1505 src/main/print-color.c:184
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
-#, fuzzy
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
-msgstr "Papier normal"
+msgstr "Paramètres principaux"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
-msgstr ""
+msgstr "Mode de sortie"
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
-#, fuzzy
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
-msgstr "Impression Recto-Verso"
+msgstr "Impression double face"
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
-msgstr ""
+msgstr "Paramètres Duplex"
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
msgid "Cyan Density"
-msgstr "Densité Cyan"
+msgstr "Densité cyan"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
-msgstr "Ajuster la densité de cyan"
+msgstr "Ajustement de la densité de cyan"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
msgid "Magenta Density"
-msgstr "Densité Magenta"
+msgstr "Densité magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
-msgstr "Ajuster la densité de magenta"
+msgstr "Ajustement de la densité de magenta"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
msgid "Yellow Density"
-msgstr "Densité Jaune"
+msgstr "Densité jaune"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
-msgstr "Ajuster la densité de jaune"
+msgstr "Ajustement de la densité de jaune"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
msgid "Black Density"
-msgstr "Densité Noir"
+msgstr "Densité du noir"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
-msgstr "Ajuster la densité de noir"
+msgstr "Ajustement du niveau de densité"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
-msgstr "Transition Cyan clair"
+msgstr "Passage cyan clair"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
-msgstr ""
+msgstr "Réglage avancé des encres"
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
-msgstr "Transition Magenta clair"
+msgstr "Transition magenta clair"
#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
msgid "Light Yellow Transition"
-msgstr "Transition Jaune clair"
+msgstr "Transition jaune clair"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr "Désactivé"
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
-msgstr ""
+msgstr "Côté court (retourné)"
#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
msgid "Auto Sheet Feeder"
-msgstr "Insertion automatique"
+msgstr "Bac automatique"
#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
msgid "Manual with Pause"
@@ -564,7 +562,7 @@ msgstr "Cassette"
#: src/main/print-canon.c:1924
msgid "CD tray"
-msgstr ""
+msgstr "support CD"
#: src/main/print-canon.c:2049
msgid "Photo CcMmYK Color"
@@ -583,46 +581,46 @@ msgid "CMY Color"
msgstr "Couleur CMJ"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Noir"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Couleur"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr "Noir et blanc"
#: src/main/print-color.c:50
msgid "High Accuracy"
-msgstr "Haute Précision"
+msgstr "Haute précision"
#: src/main/print-color.c:51
msgid "Bright Colors"
-msgstr "Couleurs vives"
+msgstr "Couleurs lumineuses"
#: src/main/print-color.c:52
msgid "Correct Hue Only"
-msgstr ""
+msgstr "Correction Hue seule"
#: src/main/print-color.c:53
msgid "Uncorrected"
-msgstr "Neutre"
+msgstr "Sans correction"
#: src/main/print-color.c:54
msgid "Desaturated"
@@ -634,12 +632,11 @@ msgstr "Seuil"
#: src/main/print-color.c:57 src/main/print-color.c:133
msgid "Raw"
-msgstr "Brut"
+msgstr "Raw"
#: src/main/print-color.c:58
-#, fuzzy
msgid "Pre-Dithered"
-msgstr "Imprimer"
+msgstr "Pré-tramé"
#: src/main/print-color.c:121 src/main/escp2-channels.c:820
#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
@@ -648,25 +645,24 @@ msgid "Grayscale"
msgstr "Niveaux de gris"
#: src/main/print-color.c:123
-#, fuzzy
msgid "Whitescale"
-msgstr "Jaune"
+msgstr "Echelle de blanc"
#: src/main/print-color.c:125
msgid "RGB"
-msgstr "RGB"
+msgstr "RVB"
#: src/main/print-color.c:127
msgid "CMY"
-msgstr "CMY"
+msgstr "CMJ"
#: src/main/print-color.c:129
msgid "CMYK"
-msgstr "CMYK"
+msgstr "CMJN"
#: src/main/print-color.c:131
msgid "KCMY"
-msgstr "KCMY"
+msgstr "NCMJ"
#: src/main/print-color.c:165 src/main/print-color.c:446
msgid "Channel "
@@ -674,7 +670,7 @@ msgstr "Canal"
#: src/main/print-color.c:165
msgid " Gamma"
-msgstr " Gamma"
+msgstr "Gamma"
#: src/main/print-color.c:165 src/main/print-color.c:216
#: src/main/print-color.c:248 src/main/print-color.c:258
@@ -687,62 +683,58 @@ msgstr "Gamma"
#: src/main/print-color.c:166
msgid "Gamma for raw channel "
-msgstr ""
+msgstr "Gamma pour canal raw"
#: src/main/print-color.c:176
msgid "Color Correction"
-msgstr "Correction couleur"
+msgstr "Correction des couleurs"
#: src/main/print-color.c:176 src/main/print-color.c:224
#: src/main/print-color.c:232 src/main/print-color.c:346
#: src/main/generic-options.c:68
msgid "Basic Image Adjustment"
-msgstr ""
+msgstr "Réglage fin de base de l'image"
#: src/main/print-color.c:177
msgid "Color correction to be applied"
-msgstr "Correction couleur à appliquer"
+msgstr "Correction de couleur à utiliser"
#: src/main/print-color.c:184
-#, fuzzy
msgid "Channel Bit Depth"
-msgstr "Profondeur de Canal en bits"
+msgstr "Profondeur du canal (nb de bits)"
#: src/main/print-color.c:185
-#, fuzzy
msgid "Bit depth per channel"
-msgstr "Profondeur en bits par canal"
+msgstr "Nb de bits par canal"
#: src/main/print-color.c:192
msgid "Input Image Type"
-msgstr "Type d'image en entrée"
+msgstr "Type d'image"
#: src/main/print-color.c:193
msgid "Input image type"
-msgstr "Type d'image en entrée"
+msgstr "Type d'image"
#: src/main/print-color.c:200
msgid "Output Image Type"
-msgstr "Type d'image en sortie"
+msgstr "Type de sortie :"
#: src/main/print-color.c:201
msgid "Output image type"
-msgstr "Type d'image en sortie"
+msgstr "Type de sortie :"
#: src/main/print-color.c:208 src/main/print-color.c:209
#: src/main/print-escp2.c:326
-#, fuzzy
msgid "Raw Channels"
-msgstr "Canaux bruts"
+msgstr "Canaux raw"
#: src/main/print-color.c:216
-#, fuzzy
msgid "SimpleGamma"
-msgstr "Gamma"
+msgstr "Gamma simple"
#: src/main/print-color.c:217
msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "Pas de correction en fonction du gamma du moniteur"
#: src/main/print-color.c:224
msgid "Brightness"
@@ -750,7 +742,7 @@ msgstr "Luminosité"
#: src/main/print-color.c:225
msgid "Brightness of the print"
-msgstr "Définit la luminosité de l'impression"
+msgstr "Luminosité de l'impression"
#: src/main/print-color.c:232
msgid "Contrast"
@@ -758,158 +750,154 @@ msgstr "Contraste"
#: src/main/print-color.c:233
msgid "Contrast of the print (0 is solid gray)"
-msgstr ""
+msgstr "Contraste de l'impression (0 = gris uniforme)"
#: src/main/print-color.c:240
msgid "Linear Contrast Adjustment"
-msgstr "Ajustement du Contraste Linéaire"
+msgstr "Réglage fin Contraste linéaire"
#: src/main/print-color.c:240
msgid "Advanced Image Control"
-msgstr "Contrôle d'image avancé"
+msgstr "Contrôle avancé de l'image"
#: src/main/print-color.c:241
msgid "Use linear vs. fixed end point contrast adjustment"
msgstr ""
+"Utilise un réglage de contraste de type linéaire plutot qu'à point fixe"
#: src/main/print-color.c:248
msgid "Composite Gamma"
-msgstr ""
+msgstr "Gamma général"
#: src/main/print-color.c:249
msgid ""
"Adjust the gamma of the print. Larger values will produce a generally "
"brighter print, while smaller values will produce a generally darker print. "
msgstr ""
-"Ajustement du Gamma de l'impression. De grandes valeurs vont généralement "
+"Ajustement de la Gamma de l'impression. De grandes valeurs vont généralement "
"produire une impression plus brillante,tandis que des petites valeurs vont "
"généralement produire une impression plus sombre. Noir et Blanc vont rester "
"identiques en fonction de l'ajustement du brillant."
#: src/main/print-color.c:258
-#, fuzzy
msgid "AppGamma"
-msgstr "Gamma"
+msgstr ""
#: src/main/print-color.c:259
msgid "Gamma value assumed by application"
-msgstr ""
+msgstr "Valeur gamma prévue par l'application"
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyan"
#: src/main/print-color.c:267
msgid "Adjust the cyan gamma"
-msgstr "Ajuster le gamma cyan"
+msgstr "Réglage du gamma pour le cyan"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
#: src/main/print-color.c:275
msgid "Adjust the magenta gamma"
-msgstr "Ajuster le gamma magenta"
+msgstr "Réglage du gamma pour le magenta"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Jaune"
#: src/main/print-color.c:283
msgid "Adjust the yellow gamma"
-msgstr "Ajuster le gamma jaune"
+msgstr "Réglage du gamma pour le jaune"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr "Rouge"
#: src/main/print-color.c:291
msgid "Adjust the red gamma"
-msgstr "Ajuster le gamma rouge"
+msgstr "Réglage du gamma pour le rouge"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr "Vert"
#: src/main/print-color.c:299
msgid "Adjust the green gamma"
-msgstr "Ajuster le gamma vert"
+msgstr "Réglage du gamma pour le vert"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr "Bleu"
#: src/main/print-color.c:307
msgid "Adjust the blue gamma"
-msgstr "Ajuster le gamma bleu"
+msgstr "Réglage du gamma pour le bleu"
#: src/main/print-color.c:315
msgid "Adjust the black gamma"
-msgstr "Ajuster le gamma noir"
+msgstr "Réglage du gamma pour le noir"
#: src/main/print-color.c:322 src/main/print-olympus.c:1330
msgid "Cyan Balance"
-msgstr ""
+msgstr "Niveau de cyan"
#: src/main/print-color.c:322 src/main/print-color.c:330
#: src/main/print-color.c:338
-#, fuzzy
msgid "GrayBalance"
-msgstr "Niveaux de gris"
+msgstr "Balance des gris"
#: src/main/print-color.c:323
-#, fuzzy
msgid "Adjust the cyan gray balance"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Réglage du cyan pour la balance des gris"
#: src/main/print-color.c:330 src/main/print-olympus.c:1338
msgid "Magenta Balance"
-msgstr "Balance Magenta"
+msgstr "Niveau de magenta"
#: src/main/print-color.c:331
-#, fuzzy
msgid "Adjust the magenta gray balance"
-msgstr "Ajuste le niveau de majenta de l'impression"
+msgstr "Réglage du magenta pour la balance des gris"
#: src/main/print-color.c:338 src/main/print-olympus.c:1346
msgid "Yellow Balance"
-msgstr "Balance Jaune"
+msgstr "Niveau de jaune"
#: src/main/print-color.c:339
-#, fuzzy
msgid "Adjust the yellow gray balance"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Réglage du jaune pour la balance des gris"
#: src/main/print-color.c:346
msgid "Saturation"
@@ -925,46 +913,46 @@ msgstr ""
"les encres noir et couleurs."
#: src/main/print-color.c:357
-#, fuzzy
msgid "Ink Limit"
-msgstr "Type d'encre"
+msgstr "Limite d'encrage"
#: src/main/print-color.c:357 src/main/print-color.c:365
#: src/main/print-color.c:373 src/main/print-color.c:381
#: src/main/print-color.c:545 src/main/print-escp2.c:332
#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#, fuzzy
msgid "Advanced Output Control"
-msgstr "Type de sortie"
+msgstr "Controle avancé de la sortie"
#: src/main/print-color.c:358
msgid "Limit the total ink printed to the page"
msgstr ""
+"Limite l'encre utilisée au total\n"
+"(peut être laissé au nombre d'encres)"
#: src/main/print-color.c:365
msgid "GCR Transition"
-msgstr ""
+msgstr "Transition GCR"
#: src/main/print-color.c:366
msgid "Adjust the gray component transition rate"
-msgstr ""
+msgstr "Régle le taux de transition de la composante gris"
#: src/main/print-color.c:373
msgid "GCR Lower Bound"
-msgstr ""
+msgstr "Limite basse GCR"
#: src/main/print-color.c:374
msgid "Lower bound of gray component reduction"
-msgstr ""
+msgstr "Limite basse de la composante gris"
#: src/main/print-color.c:381
msgid "GCR Upper Bound"
-msgstr ""
+msgstr "Limite haute GCR"
#: src/main/print-color.c:382
msgid "Upper bound of gray component reduction"
-msgstr ""
+msgstr "Limite haute de la composante gris"
#: src/main/print-color.c:446
msgid " Curve"
@@ -980,123 +968,122 @@ msgstr "Courbes de sortie"
#: src/main/print-color.c:447
msgid "Curve for raw channel "
-msgstr ""
+msgstr "Courbe pour données brutes (raw)"
#: src/main/print-color.c:457
msgid "Cyan Curve"
-msgstr "Courbe Cyan"
+msgstr "Courbe cyan"
#: src/main/print-color.c:458
msgid "Cyan curve"
-msgstr "Courbe Cyan"
+msgstr "Courbe cyan"
#: src/main/print-color.c:465
msgid "Magenta Curve"
-msgstr "Courbe Magenta"
+msgstr "Courbe magenta"
#: src/main/print-color.c:466
msgid "Magenta curve"
-msgstr "Courbe Magenta"
+msgstr "Courbe magenta"
#: src/main/print-color.c:473
msgid "Yellow Curve"
-msgstr "Courbe Jaune"
+msgstr "Courbe jaune"
#: src/main/print-color.c:474
msgid "Yellow curve"
-msgstr "Courbe Jaune"
+msgstr "Courbe jaune"
#: src/main/print-color.c:481
msgid "Black Curve"
-msgstr "Courbe Noir"
+msgstr "Courbe noir"
#: src/main/print-color.c:482
msgid "Black curve"
-msgstr "Courbe Noir"
+msgstr "Courbe noir"
#: src/main/print-color.c:489
msgid "Red Curve"
-msgstr "Courbe Rouge"
+msgstr "Courbe rouge"
#: src/main/print-color.c:490
msgid "Red curve"
-msgstr "Courbe Rouge"
+msgstr "Courbe rouge"
#: src/main/print-color.c:497
msgid "Green Curve"
-msgstr "Courbe Verte"
+msgstr "Courbe vert"
#: src/main/print-color.c:498
msgid "Green curve"
-msgstr "Courbe Verte"
+msgstr "Courbe vert"
#: src/main/print-color.c:505
msgid "Blue Curve"
-msgstr "Courbe Bleu"
+msgstr "Courbe bleu"
#: src/main/print-color.c:506
msgid "Blue curve"
-msgstr "Courbe Bleu"
+msgstr "Courbe bleu"
#: src/main/print-color.c:513
msgid "White Curve"
-msgstr "Courbe Blanc"
+msgstr "Courbe blanc"
#: src/main/print-color.c:514
msgid "White curve"
-msgstr "Courbe Blanc"
+msgstr "Courbe blanc"
#: src/main/print-color.c:521
msgid "Hue Map"
-msgstr ""
+msgstr "Carte Hue"
#: src/main/print-color.c:521 src/main/print-color.c:529
#: src/main/print-color.c:537
msgid "Advanced HSL Curves"
-msgstr ""
+msgstr "Courbes HSL avancées"
#: src/main/print-color.c:522
msgid "Hue adjustment curve"
-msgstr ""
+msgstr "Courbe de réglage fin HUE"
#: src/main/print-color.c:529
-#, fuzzy
msgid "Saturation Map"
-msgstr "Saturation"
+msgstr "Carte de saturation"
#: src/main/print-color.c:530
msgid "Saturation adjustment curve"
-msgstr "Courbe d'ajustement de la Saturation"
+msgstr "Courbe de réglage de la saturation"
#: src/main/print-color.c:537
msgid "Luminosity Map"
-msgstr ""
+msgstr "Carte de luminosité"
#: src/main/print-color.c:538
msgid "Luminosity adjustment curve"
-msgstr ""
+msgstr "Courbe de réglage de la luminosité"
#: src/main/print-color.c:545
msgid "Gray Component Reduction"
-msgstr ""
+msgstr "Composante gris"
#: src/main/print-color.c:546
msgid "Gray component reduction curve"
-msgstr ""
+msgstr "Courbe de la composante gris"
#: src/main/print-color.c:1668
msgid "Traditional Gutenprint color conversion"
-msgstr ""
+msgstr "Conversion de couleur traditionelle Gutenprint"
#: src/main/printers.c:503
#, c-format
msgid "Value must be set for %s\n"
-msgstr ""
+msgstr "Valeur à définir pour: %s\n"
#: src/main/printers.c:516 src/main/printers.c:521
-#, fuzzy, c-format
+#, c-format
msgid "`%s' is not a valid %s\n"
-msgstr "%s n'est pas un paramètre valide de type %s\n"
+msgstr "%s n'est pas une valeur valide pour %s\n"
#: src/main/printers.c:540
#, c-format
@@ -1106,17 +1093,17 @@ msgstr "%s doit être entre %f et %f (actuellement %f)\n"
#: src/main/printers.c:562 src/main/printers.c:586
#, c-format
msgid "%s must be between %d and %d (is %d)\n"
-msgstr "%s doit être entre %d et %d (actuellemtn %d)\n"
+msgstr "%s doit être entre %d et %d (actuellement %d)\n"
#: src/main/printers.c:617
#, c-format
msgid "%s bounds must be between %f and %f\n"
-msgstr "%s bounds must be between %f and %f\n"
+msgstr "%s limites doivent être entre %f et %f\n"
#: src/main/printers.c:625
#, c-format
msgid "%s wrap mode must be %s\n"
-msgstr ""
+msgstr "%s wrap mode doit être %s\n"
#: src/main/printers.c:629
msgid "no wrap"
@@ -1127,9 +1114,9 @@ msgid "wrap around"
msgstr ""
#: src/main/printers.c:673
-#, fuzzy, c-format
+#, c-format
msgid "Unknown type parameter %s (%d)\n"
-msgstr "Imprimante inconnue %s\n"
+msgstr "paramètre de type inconnu %s (%d)\n"
#: src/main/printers.c:686 src/main/printers.c:697
#, c-format
@@ -1138,7 +1125,7 @@ msgstr "%s hors-intervalle (valeur %d, mini %d, maxi %d)\n"
#: src/main/printers.c:755
msgid "Page size is not valid\n"
-msgstr "La taille de page n'est pas valide\n"
+msgstr "La taille de la page n'est pas valide\n"
#: src/main/printers.c:776
#, c-format
@@ -1156,7 +1143,7 @@ msgstr "La hauteur doit être supérieure à zéro\n"
#: src/main/printers.c:794
msgid "Width must be greater than zero\n"
-msgstr "La largeur doit être supérieure à zéro\n"
+msgstr "La largeur doit être plus grande que zéro\n"
#: src/main/printers.c:800
#, c-format
@@ -1164,8 +1151,8 @@ msgid ""
"Image is too wide for the page: left margin is %d, width %d, right edge is %"
"d\n"
msgstr ""
-"L'image est trop large pour la page: marge gauche: %d, largeur: %d, bord "
-"droit: %d\n"
+"L'image est trop large pour la page: marge gauche %d, largeur %d, bord droit "
+"%d\n"
#: src/main/printers.c:807
#, c-format
@@ -1173,168 +1160,160 @@ msgid ""
"Image is too long for the page: top margin is %d, height %d, bottom edge is %"
"d\n"
msgstr ""
-"L'image est trop longue pour la page: marge supérieure: %d, hauteur: %d, "
-"bord inférieur: %d\n"
-
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+"L'image est trop haute pour la page: marge en haut %d, hauteur %d, bord du "
+"bas %d\n"
+
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Alimentation rouleau"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
-msgstr ""
+msgstr "Alimentation rouleau (couper chaque page)"
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
-msgstr ""
+msgstr "Alimentation rouleau (sans découpe des pages)"
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
-msgstr "Chargement Manuel"
+msgstr "Alimentation manuelle"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
-msgstr "Imprimer vers un CD"
+msgstr "Imprimer un CD"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
-#, fuzzy
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
msgid "Manual Sheet Guide"
-msgstr "Sélection Manuelle"
+msgstr "Alimentation guide par feuille (arrière)"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
-#, fuzzy
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
msgid "Manual Feed (Front)"
-msgstr "Chargement Manuel"
+msgstr "Alimentation manuelle (avant)"
-#: src/main/print-escp2-data.c:553
-#, fuzzy
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
-msgstr "Bac"
+msgstr "Bac arrière"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
-msgstr ""
+msgstr "Bac avant"
-#: src/main/print-escp2-data.c:580
-#, fuzzy
+#: src/main/print-escp2-data.c:581
msgid "Photo Board"
-msgstr "Noir photo"
+msgstr "Carte photo"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
-msgstr ""
+msgstr "Coupe papier Bin 1"
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
-msgstr ""
+msgstr "Coupe papier Bin 2"
-#: src/main/print-escp2-data.c:637
-#, fuzzy
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
-msgstr "Sélection auto"
+msgstr "Sélection de coupe automatique"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
-msgstr "Sélection Manuelle"
+msgstr "Sélection manuelle"
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
-msgstr "Économique Rapide"
+msgstr "Rapide (économique)"
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
-msgstr "Économique"
+msgstr "Economique"
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr "Brouillon"
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
-msgstr "Haut"
+msgstr "Hauteur"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
-msgstr "Photographie"
+msgstr "Photo"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
msgid "Super Photo"
-msgstr "Photographie haute qualité"
+msgstr "Super Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
-#, fuzzy
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
msgid "Ultra Photo"
-msgstr "Six couleurs photo"
+msgstr "Ultra photo"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
-msgstr "Optimale"
+msgstr "Meilleur"
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr "Cyan clair"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
msgstr "Magenta clair"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
msgstr "Noir clair"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
-msgstr "Jaune Foncé"
+msgstr "Jaune foncé"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
-msgstr "Noir mat"
+msgstr "Noir Mat"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
msgstr "Noir photo"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
-#, fuzzy
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
-msgstr "Film glacé"
+msgstr "Optimiseur de brillance"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
-#, fuzzy
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
-msgstr "Noir"
+msgstr "Noir très clair"
#: src/main/print-escp2.c:159
msgid "Automatic Printing Mode"
@@ -1343,7 +1322,7 @@ msgstr "Mode d'impression automatique"
#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
#: src/main/generic-options.c:62
msgid "Basic Output Adjustment"
-msgstr ""
+msgstr "Réglage de base"
#: src/main/print-escp2.c:160
msgid "Automatic printing mode"
@@ -1356,23 +1335,25 @@ msgstr "Qualité d'impression"
#: src/main/print-escp2.c:195
msgid "CD Hub Size"
-msgstr ""
+msgstr "Taille du moyeu du CD"
#: src/main/print-escp2.c:196
msgid "Print only outside of the hub of the CD, or all the way to the hole"
msgstr ""
+"Imprime seulement sur le CD en dehors du moyeu ou y compris le moyeu "
+"jusqu'au trou"
#: src/main/print-escp2.c:201
msgid "CD Horizontal Fine Adjustment"
-msgstr ""
+msgstr "Réglage horizontal précis du CD"
#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
+msgstr "Réglage précis de la position horizontale pour l'impression sur CD"
#: src/main/print-escp2.c:207
msgid "CD Vertical Fine Adjustment"
-msgstr ""
+msgstr "Réglage vertical précis du CD"
#: src/main/print-escp2.c:214
msgid "Resolution of the print"
@@ -1380,58 +1361,57 @@ msgstr "Résolution de l'impression"
#: src/main/print-escp2.c:230
msgid "Enhanced Gloss"
-msgstr ""
+msgstr "Amélioration de la brillance"
#: src/main/print-escp2.c:231
msgid "Add gloss enhancement"
-msgstr ""
+msgstr "Ajouter l'amélioration de brillance"
#: src/main/print-escp2.c:236
msgid "Ink Set"
-msgstr "Type d'encre"
+msgstr "Jeu d'encres"
#: src/main/print-escp2.c:242
msgid "Printing Direction"
-msgstr "Direction d'impression"
+msgstr "Sens d'impression"
#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
msgid "Advanced Output Adjustment"
-msgstr ""
+msgstr "Réglage avancé de sorties"
#: src/main/print-escp2.c:243
msgid "Printing direction (unidirectional is higher quality, but slower)"
msgstr ""
-"Direction d'impression (unidirectionnel est de meilleure qualité, mais plus "
-"lent)"
+"Sens d'impression (unidirectionnel est de meilleure qualité mais plus lent)"
#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
msgid "Borderless"
-msgstr "Impression sans bords"
+msgstr "sans marges"
#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
msgid "Print without borders"
-msgstr "Imprimer sans bordures (pleine page)"
+msgstr "Impression sans marges"
#: src/main/print-escp2.c:254
msgid "Interleave Method"
-msgstr ""
+msgstr "Méthode d'entrelacement"
#: src/main/print-escp2.c:255
msgid "Interleave pattern to use"
-msgstr ""
+msgstr "Motif d'entrelacement"
#: src/main/print-escp2.c:260
msgid "Adjust dot size as necessary"
-msgstr "Ajuster la taille des gouttes"
+msgstr "Ajuster la taille des gouttes si nécessaire"
#: src/main/print-escp2.c:261
msgid "Adjust dot size as necessary to achieve desired density"
msgstr ""
-"Ajuster la taille des gouttes si nécessaire pour atteindre la densité désirée"
+"Ajuster la taille des gouttes si nécessaire pour obtenir la densité souhaitée"
#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
msgid "Output Order"
-msgstr "Ordre sortie"
+msgstr "Ordre de sortie"
#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
msgid "Alignment Passes"
@@ -1451,237 +1431,225 @@ msgstr ""
#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
#: src/main/print-escp2.c:303
-#, fuzzy
msgid "Alternate Alignment Choices"
-msgstr "Répétition de l'opération d'alignement.\n"
+msgstr "Choix d'alignement alternatif"
#: src/main/print-escp2.c:302
msgid "Supports Packet Mode"
-msgstr ""
+msgstr "Supporte le mode paquet"
#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
msgid "Channel Names"
-msgstr "Noms des canaux"
+msgstr "Nom des canaux"
#: src/main/print-escp2.c:327
msgid "Raw Channel Count"
msgstr ""
#: src/main/print-escp2.c:332
-#, fuzzy
msgid "Cyan Map"
-msgstr "Cyan"
+msgstr "Carte du cyan"
#: src/main/print-escp2.c:333
-#, fuzzy
msgid "Adjust the cyan map"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Modification de la carte du cyan"
#: src/main/print-escp2.c:338
-#, fuzzy
msgid "Magenta Map"
-msgstr "Magenta"
+msgstr "Carte du magenta"
#: src/main/print-escp2.c:339
-#, fuzzy
msgid "Adjust the magenta map"
-msgstr "Ajuste le niveau de majenta de l'impression"
+msgstr "Modification de la carte du majenta"
#: src/main/print-escp2.c:344
-#, fuzzy
msgid "Yellow Map"
-msgstr "Jaune"
+msgstr "Carte du jaune"
#: src/main/print-escp2.c:345
-#, fuzzy
msgid "Adjust the yellow map"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Modification de la carte du jaune"
#: src/main/print-escp2.c:350
-#, fuzzy
msgid "Blue Map"
-msgstr "Bleu"
+msgstr "Carte du bleu"
#: src/main/print-escp2.c:351
-#, fuzzy
msgid "Adjust the blue map"
-msgstr "Ajuste le niveau de bleu de l'impression"
+msgstr "Modification de la carte du bleu"
#: src/main/print-escp2.c:356
msgid "Red Map"
-msgstr ""
+msgstr "Carte du rouge"
#: src/main/print-escp2.c:357
-#, fuzzy
msgid "Adjust the red map"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Modification de la carte du rouge"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
msgid "Red Density"
-msgstr "Densité Rouge"
+msgstr "Densité du rouge"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
-msgstr "Ajuster la densité du rouge"
+msgstr "Ajuste la densité du rouge"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
msgid "Blue Density"
-msgstr "Densité Bleu"
+msgstr "Densité du bleu"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
-msgstr "Ajuster la densité du bleu"
+msgstr "Ajuste la densité du bleu"
-#: src/main/print-escp2.c:461
-#, fuzzy
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
-msgstr "Film glacé"
+msgstr "Niveau de brillance"
-#: src/main/print-escp2.c:462
-#, fuzzy
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
-msgstr "Ajuste le niveau de brillance de l'impression"
+msgstr "Ajuste le niveau de brillance"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
-msgstr "Transition Jaune Foncé"
+msgstr "transition jaune foncé"
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
-msgstr "Transition Gris"
+msgstr "Transition gris"
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
-msgstr "Transition Gris Clair"
+msgstr "Transition cyan clair"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
-msgstr "Transition Gris Foncé"
+msgstr "Transition gris foncé"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
-msgstr "Transition Gris Médian"
+msgstr "Transition gris médian"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
-msgstr "Transition Gris Moyen"
+msgstr "Transition gris moyen"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
-msgstr "Contrôle manuel complêt"
+msgstr "Contrôle manuel complet"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
-msgstr ""
+msgstr "Controle réglage automatique"
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr "CD - 5 pouces"
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr "CD - 3 pouces"
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr "Normal"
-#: src/main/print-escp2.c:1484
-#, fuzzy
+#: src/main/print-escp2.c:1564
msgid "Print To Hub"
-msgstr "Imprimer dans un fichier ?"
+msgstr "Imprimer sue le moyeu"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
msgid "Manual Control"
-msgstr "Contrôle manuel"
+msgstr "Controle manuel"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
msgstr "Automatique"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr "Bidirectionnel"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
-msgstr "Unidirectionnel"
+msgstr "Unirectionnel"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
-msgstr ""
+msgstr "en alternance"
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
-msgstr ""
+msgstr "en montant"
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
-msgstr ""
+msgstr "en descendant"
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
-msgstr ""
+msgstr "en montant - double"
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
-msgstr ""
+msgstr "en évitant les voisins"
-#: src/main/print-escp2.c:2087
-#, fuzzy, c-format
+#: src/main/print-escp2.c:2168
+#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "L'imprimante ne supporte pas les sorties en couleur\n"
+msgstr "L'imprimante ne supporte pas les sorties directes en %d bits\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
-msgstr "Options d'impression non vérifiées; ne peux imprimer.\n"
+msgstr "Options d'impression non vérifiées: ne peut pas imprimer.\n"
#: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
msgid "300 DPI x 600 DPI"
-msgstr "300 x 600 ppp"
+msgstr "300 x 600 PPP"
#: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
msgid "600 DPI"
-msgstr "600 ppp"
+msgstr "600 PPP"
#: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
msgid "600 DPI high quality"
-msgstr "600 ppp Haute qualité"
+msgstr "600 PPP Haute qualité"
#: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
msgid "600 DPI Unidirectional"
-msgstr "600 ppp Unirectionnel"
+msgstr "600 PPP Unirectionnel"
#: src/main/print-lexmark.c:581 src/main/print-lexmark.c:657
msgid "1200 DPI"
-msgstr "1200 ppp"
+msgstr "1200 PPP"
#: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
msgid "1200 DPI high quality"
-msgstr "1200 ppp Haute qualité"
+msgstr "1200 PPP Haute qualité"
#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
msgid "1200 DPI highest quality"
-msgstr "1200 ppp Très haute qualité"
+msgstr "1200 PPP Très haute qualité"
#: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
msgid "1200 DPI Unidirectional"
-msgstr "1200 ppp Unidirectionnel"
+msgstr "1200 PPP Unidirectionnel"
#: src/main/print-lexmark.c:585
msgid "2400 DPI x 1200 DPI"
-msgstr "2400 x 1200 ppp"
+msgstr "2400 x 1200 PPP"
#: src/main/print-lexmark.c:586
msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 x 1200 ppp Haute qualité"
+msgstr "2400 x 1200 PPP Haute qualité"
#: src/main/print-lexmark.c:587
msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 x 1200 ppp Très haute qualité"
+msgstr "2400 x 1200 PPP Très haute qualité"
#: src/main/print-lexmark.c:589
msgid "test print"
@@ -1725,7 +1693,7 @@ msgstr "Cinq couleurs photo composite"
#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
#: src/main/escp2-papers.c:1394
msgid "Glossy Film"
-msgstr "Film glacé"
+msgstr "Film brillant"
#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
@@ -1792,55 +1760,48 @@ msgstr "Papier épais Ilford"
#: src/main/print-olympus.c:265
msgid "Coated"
-msgstr ""
+msgstr "Couché"
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr "Aucun"
#: src/main/print-olympus.c:859
-#, fuzzy
msgid "Glossy"
-msgstr "Film glacé"
+msgstr "Brillant"
#: src/main/print-olympus.c:860
msgid "Texture"
-msgstr ""
+msgstr "Texture"
#: src/main/print-olympus.c:861
-#, fuzzy
msgid "Matte"
-msgstr "Papier Mat"
+msgstr "Mat"
#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
msgid "Laminate Pattern"
-msgstr ""
+msgstr "Motif du vernis protecteur"
#: src/main/print-olympus.c:1331
-#, fuzzy
msgid "Adjust the cyan balance"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Réglage balance cyan"
#: src/main/print-olympus.c:1339
-#, fuzzy
msgid "Adjust the magenta balance"
-msgstr "Ajuste le niveau de majenta de l'impression"
+msgstr "Réglage balance magenta"
#: src/main/print-olympus.c:1347
-#, fuzzy
msgid "Adjust the yellow balance"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgstr "Réglage balance jaune"
#: src/main/print-olympus.c:1354
-#, fuzzy
msgid "Black Balance"
-msgstr "Noir et blanc"
+msgstr "Balance du noir"
#: src/main/print-olympus.c:1355
-#, fuzzy
msgid "Adjust the black balance"
-msgstr "Ajuste le niveau de cyan de l'impression"
+msgstr "Réglage de la balance du noir"
#: src/main/print-pcl.c:182
msgid "Plain"
@@ -1856,7 +1817,7 @@ msgstr "Premium"
#: src/main/print-pcl.c:185
msgid "Glossy Photo"
-msgstr "Glacé photo"
+msgstr "Photo brillant"
#: src/main/print-pcl.c:186
msgid "Transparency"
@@ -1918,39 +1879,38 @@ msgstr "600 x 600 ppp Monochrome"
msgid "2400x600 DPI"
msgstr "2400 x 600 ppp"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Cartouches couleur et noir"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Cartouches couleur et photo"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "Côté long (standard)"
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
msgid "PPDFile"
msgstr "Fichier PPD"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
msgid "PPD File"
msgstr "Fichier PPD"
#: src/main/print-raw.c:223
msgid "Image dimensions must match paper dimensions"
-msgstr ""
+msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
msgid "Two Level Grayscale"
-msgstr "Niveaux de gris deux niveaux"
+msgstr "EChelle de gris à deux niveaux"
#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
-#, fuzzy
msgid "Three Level Grayscale"
-msgstr "Niveaux de gris deux niveaux"
+msgstr "Trois niveaux de gris"
#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
@@ -1958,7 +1918,7 @@ msgstr "Niveaux de gris deux niveaux"
#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
msgid "Quadtone"
-msgstr "Quadichromie"
+msgstr "Quadtone"
#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
msgid "Six Color Enhanced Composite"
@@ -1975,77 +1935,67 @@ msgstr "Sept couleurs amélioré"
#: src/main/escp2-channels.c:1535
msgid "Eight Color Photo"
-msgstr "Photo huit couleurs"
+msgstr "Huit couleurs photo"
#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
-#, fuzzy
msgid "One Color Raw"
-msgstr "Photo sept couleurs"
+msgstr "Une couleur de base"
#: src/main/escp2-channels.c:1695
-#, fuzzy
msgid "One Color Raw Enhanced Gloss"
-msgstr "Sept couleurs amélioré"
+msgstr "Une couleur de base optimiseur de brillance"
#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
-#, fuzzy
msgid "Two Color Raw"
-msgstr "Quatre couleurs standard"
+msgstr "Deux couleurs de base"
#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
#: src/main/escp2-channels.c:1829
-#, fuzzy
msgid "Three Color Raw"
-msgstr "Trois couleurs composite"
+msgstr "Trois couleurs de base"
#: src/main/escp2-channels.c:1762
-#, fuzzy
msgid "Three Color Raw Gloss"
-msgstr "Trois couleurs composite"
+msgstr "Trois couleurs de base brillant"
#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
-#, fuzzy
msgid "Four Color Raw"
-msgstr "Quatre couleurs standard"
+msgstr "Quatre couleurs de base"
#: src/main/escp2-channels.c:1884
-#, fuzzy
msgid "Four Color Raw Gloss"
-msgstr "Quatre couleurs standard"
+msgstr "Quatre couleurs de base brillant"
#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
-#, fuzzy
msgid "Five Color Raw"
-msgstr "Photo sept couleurs"
+msgstr "Cinq couleurs de base"
#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
msgid "Six Color Raw"
-msgstr "Six couleurs brut"
+msgstr "Six couleurs de base"
#: src/main/escp2-channels.c:1962
-#, fuzzy
msgid "Six Color Enhanced Gloss Raw"
-msgstr "Six couleurs amélioré composite"
+msgstr "Six couleurs de base Optimiseur de brillance"
#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
#: src/main/escp2-channels.c:2007
msgid "Seven Color Raw"
-msgstr "Sept couleurs brut"
+msgstr "Sept couleurs de base"
#: src/main/escp2-channels.c:2024
-#, fuzzy
msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sept couleurs amélioré"
+msgstr "Sept couleurs de base Optimiseur de brillance"
#: src/main/escp2-channels.c:2042
msgid "Eight Color Raw"
-msgstr "Huit couleurs brut"
+msgstr "Huit couleurs de base"
#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
@@ -2055,15 +2005,15 @@ msgstr "Huit couleurs brut"
#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
msgid "EPSON Standard Inks"
-msgstr "Encres EPSON Standard"
+msgstr "Encres standard EPSON"
#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
msgid "UltraChrome Photo Black"
-msgstr "Noir Photo UltraChrome"
+msgstr "Ultrachrome noir photo"
#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
msgid "UltraChrome Matte Black"
-msgstr "Noir Mat UltraChrome"
+msgstr "Ultrachrome noir mat"
#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
@@ -2087,51 +2037,50 @@ msgstr "Film back light"
#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
-#, fuzzy
msgid "Matte Paper Heavyweight"
-msgstr "Papier Mat"
+msgstr "Papier Mat Heavyweight"
#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
msgid "Premium Semigloss Photo Paper"
-msgstr "Papier semi-glacé photo Premium"
+msgstr "Papier semi-brillant photo Premium"
#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
msgid "ColorLife Paper"
-msgstr "Papier ColorLife"
+msgstr "Papier Colorlife"
#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
#: src/main/escp2-papers.c:1418
msgid "Archival Matte Paper"
-msgstr "Papier Mat pour Archivage"
+msgstr "Papier Mat Archival"
#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
#: src/main/escp2-papers.c:1420
msgid "Watercolor Paper - Radiant White"
-msgstr ""
+msgstr "Papier aquarelle - radiant white"
#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
msgid "360 x 90 DPI Fast Economy"
-msgstr "360 x 90 DPI Fast Economy"
+msgstr "360x90 ppp rapide économique"
#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 ppp Économique"
+msgstr "360 x 120 ppp Economique"
#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
msgid "180 DPI Economy"
-msgstr "180 ppp Économique"
+msgstr "180 ppp Economique"
#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
msgid "360 x 180 DPI Draft"
-msgstr "360 x 180 ppp Brouillon"
+msgstr "360 x 180 ppp brouillon"
#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
msgid "360 x 240 DPI Draft"
-msgstr "360 x 240 ppp Brouillon"
+msgstr "360 x 240 ppp brouillon"
#: src/main/escp2-resolutions.c:68
msgid "360 DPI High Quality"
@@ -2156,7 +2105,7 @@ msgstr "720 ppp Haute qualité"
#: src/main/escp2-resolutions.c:97
msgid "720 DPI Highest Quality"
-msgstr "720 ppp Très haute qualité"
+msgstr "720 ppp Qualité maximale"
#: src/main/escp2-resolutions.c:100
msgid "720 x 720 DPI"
@@ -2169,7 +2118,7 @@ msgstr "1440 x 720 ppp"
#: src/main/escp2-resolutions.c:110
msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 720 ppp Très haute qualité"
+msgstr "1440 x 720 ppp Trés haute qualité"
#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
msgid "1440 x 720 DPI Transposed"
@@ -2181,7 +2130,7 @@ msgstr "2880 x 720 ppp"
#: src/main/escp2-resolutions.c:129
msgid "2880 x 720 DPI Highest Quality"
-msgstr "2880 x 720 ppp Très haute qualité"
+msgstr "2880 x 720 ppp Trés haute qualité"
#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
#: src/main/escp2-resolutions.c:139
@@ -2189,19 +2138,16 @@ msgid "1440 x 1440 DPI"
msgstr "1440 x 1440 ppp"
#: src/main/escp2-resolutions.c:142
-#, fuzzy
msgid "1440 x 1440"
-msgstr "1440 x 1440 ppp"
+msgstr "1440 x 1440"
#: src/main/escp2-resolutions.c:145
-#, fuzzy
msgid "1440 x 1440 DPI High Quality"
-msgstr "2880 x 720 ppp Très haute qualité"
+msgstr "1440 x 1440 ppp Haute qualité"
#: src/main/escp2-resolutions.c:148
-#, fuzzy
msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 720 ppp Très haute qualité"
+msgstr "1440 x 1440 ppp Qualité maximale"
#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
#: src/main/escp2-resolutions.c:161
@@ -2210,17 +2156,15 @@ msgstr "2880 x 1440 ppp"
#: src/main/escp2-resolutions.c:158
msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 ppp Transposé"
+msgstr "2880 x 1440 ppp transposé"
#: src/main/escp2-resolutions.c:164
-#, fuzzy
msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 720 ppp Très haute qualité"
+msgstr "2880 x 720 ppp Haute qualité"
#: src/main/escp2-resolutions.c:167
-#, fuzzy
msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 x 720 ppp Très haute qualité"
+msgstr "2880 x 1440 ppp Qualité maximale"
#: src/main/escp2-resolutions.c:171
msgid "5760 x 1440 DPI"
@@ -2236,13 +2180,12 @@ msgstr "5760 x 2880 ppp"
#: src/main/escp2-resolutions.c:548
msgid "On"
-msgstr "Activé"
+msgstr "Actif"
#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
#: src/main/escp2-resolutions.c:579
-#, fuzzy
msgid "Interleave"
-msgstr "Nom de l'imprimante :"
+msgstr "Entrelacement"
#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
#: src/main/escp2-resolutions.c:580
@@ -2252,7 +2195,7 @@ msgstr ""
#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
#: src/main/escp2-resolutions.c:581
msgid "Four Pass"
-msgstr ""
+msgstr "quatre passes"
#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
#: src/main/escp2-resolutions.c:582
@@ -2260,14 +2203,12 @@ msgid "Full Overlap 2"
msgstr ""
#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
-#, fuzzy
msgid "Interleave 2"
-msgstr "Nom de l'imprimante :"
+msgstr "Entrelancement 2"
#: src/main/escp2-resolutions.c:584
-#, fuzzy
msgid "Eight Pass"
-msgstr "Luminosité :"
+msgstr "huit passes"
#: src/main/generic-options.c:46
msgid "Text"
@@ -2279,7 +2220,7 @@ msgstr "Graphiques"
#: src/main/generic-options.c:48
msgid "Mixed Text and Graphics"
-msgstr "Texte et Graphiques"
+msgstr "Texte et graphiques"
#: src/main/generic-options.c:49
msgid "Photograph"
@@ -2295,7 +2236,7 @@ msgstr "Page"
#: src/main/generic-options.c:56
msgid "Job"
-msgstr ""
+msgstr "Travail"
#: src/main/generic-options.c:68
msgid "Image Type"
@@ -2307,19 +2248,19 @@ msgstr "Type d'image à imprimer"
#: src/main/generic-options.c:74 src/main/generic-options.c:80
msgid "Job Mode"
-msgstr ""
+msgstr "Mode de travail"
#: src/main/generic-options.c:75
msgid "Job vs. page mode"
-msgstr ""
+msgstr "Mode Travail/Page"
#: src/main/generic-options.c:80
msgid "Page Number"
-msgstr "Numéro de page"
+msgstr "Page numéro"
#: src/main/generic-options.c:81
msgid "Page number"
-msgstr "Numéro de page"
+msgstr "Page numéro"
#: src/main/xmli18n-tmp.h:1
msgid "Letter"
@@ -2346,9 +2287,8 @@ msgid "4x6"
msgstr "4x6"
#: src/main/xmli18n-tmp.h:10
-#, fuzzy
msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Papier photo Epson 4x6"
+msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
#: src/main/xmli18n-tmp.h:11
msgid "5x7"
@@ -2376,7 +2316,7 @@ msgstr "Super B 13x19"
#: src/main/xmli18n-tmp.h:18
msgid "Engineering C 17x22"
-msgstr ""
+msgstr "Engineering C 17x22"
#: src/main/xmli18n-tmp.h:19
msgid "8x12"
@@ -2412,7 +2352,7 @@ msgstr "24x30"
#: src/main/xmli18n-tmp.h:27
msgid "Super A1 24x36"
-msgstr ""
+msgstr "Super A1 24x36"
#: src/main/xmli18n-tmp.h:28
msgid "30x40"
@@ -2567,9 +2507,8 @@ msgid "B10 ISO"
msgstr "B10 ISO"
#: src/main/xmli18n-tmp.h:66
-#, fuzzy
msgid "Super B0 JIS"
-msgstr "B0 JIS"
+msgstr "Super B0 JIS"
#: src/main/xmli18n-tmp.h:67
msgid "B0 JIS"
@@ -2677,7 +2616,7 @@ msgstr "ArchA"
#: src/main/xmli18n-tmp.h:93
msgid "ArchA transposed"
-msgstr ""
+msgstr "ArchA sens paysage"
#: src/main/xmli18n-tmp.h:94
msgid "ArchB"
@@ -2685,7 +2624,7 @@ msgstr "ArchB"
#: src/main/xmli18n-tmp.h:95
msgid "ArchB transposed"
-msgstr ""
+msgstr "ArchB sens paysage"
#: src/main/xmli18n-tmp.h:96
msgid "ArchC"
@@ -2693,7 +2632,7 @@ msgstr "ArchC"
#: src/main/xmli18n-tmp.h:97
msgid "ArchC transposed"
-msgstr ""
+msgstr "ArcgC sens paysage"
#: src/main/xmli18n-tmp.h:98
msgid "ArchD"
@@ -2701,7 +2640,7 @@ msgstr "ArchD"
#: src/main/xmli18n-tmp.h:99
msgid "ArchD transposed"
-msgstr ""
+msgstr "ArchD sens paysage"
#: src/main/xmli18n-tmp.h:100
msgid "ArchE"
@@ -2709,7 +2648,7 @@ msgstr "ArchE"
#: src/main/xmli18n-tmp.h:101
msgid "ArchE transposed"
-msgstr ""
+msgstr "ArchE sens paysage"
#: src/main/xmli18n-tmp.h:102
msgid "American foolscap"
@@ -2801,7 +2740,7 @@ msgstr "Commercial 10"
#: src/main/xmli18n-tmp.h:124
msgid "A2 Invitation"
-msgstr "Invitation A2"
+msgstr "A2 Invitation"
#: src/main/xmli18n-tmp.h:125
msgid "Monarch Envelope"
@@ -2809,7 +2748,7 @@ msgstr "Enveloppe Monarch"
#: src/main/xmli18n-tmp.h:126
msgid "4x5 3/8"
-msgstr ""
+msgstr "4x5 3/8"
#: src/main/xmli18n-tmp.h:127
msgid "4x7"
@@ -2817,28 +2756,27 @@ msgstr "4x7"
#: src/main/xmli18n-tmp.h:128
msgid "CP_L"
-msgstr ""
+msgstr "CP_L"
#: src/main/xmli18n-tmp.h:129
msgid "Card"
msgstr "Carte"
#: src/main/xmli18n-tmp.h:130
-#, fuzzy
msgid "Wide Postcard"
-msgstr "Carte postale"
+msgstr "Carte postale large"
#: src/main/xmli18n-tmp.h:131
msgid "Chilean Office"
-msgstr ""
+msgstr "Chilean Office"
#: src/main/xmli18n-tmp.h:132
msgid "Chilean Double Letter"
-msgstr ""
+msgstr "Chilean Double Letter"
#: src/main/xmli18n-tmp.h:133
msgid "Chilean Double Office"
-msgstr ""
+msgstr "Chilean Double Office"
#: src/main/xmli18n-tmp.h:134
msgid "Custom"
@@ -2882,145 +2820,119 @@ msgstr "Rouleau 44 pouces"
#: src/main/xmli18n-tmp.h:144
msgid "PostScript Level 1"
-msgstr "PostScript Niveau 1"
+msgstr "Postscript level 1"
#: src/main/xmli18n-tmp.h:145
msgid "PostScript Level 2"
-msgstr "PostScript Niveau 2"
+msgstr "Postscript level 2"
#: src/main/xmli18n-tmp.h:146
-#, fuzzy
msgid "Canon BJ-30"
-msgstr "Canon BJC 30"
+msgstr "Canon BJC-30"
#: src/main/xmli18n-tmp.h:147
-#, fuzzy
msgid "Canon BJC-50"
-msgstr "Canon BJC 50"
+msgstr "Canon BJC-50"
#: src/main/xmli18n-tmp.h:148
-#, fuzzy
msgid "Canon BJC-55"
-msgstr "Canon BJC 55"
+msgstr "Canon BJC-55"
#: src/main/xmli18n-tmp.h:149
-#, fuzzy
msgid "Canon BJC-80"
-msgstr "Canon BJC 80"
+msgstr "Canon BJC-80"
#: src/main/xmli18n-tmp.h:150
-#, fuzzy
msgid "Canon BJC-85"
-msgstr "Canon BJC 85"
+msgstr "Canon BJC-85"
#: src/main/xmli18n-tmp.h:151
-#, fuzzy
msgid "Canon BJC-210"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-210"
#: src/main/xmli18n-tmp.h:152
-#, fuzzy
msgid "Canon BJC-240"
-msgstr "Canon BJC 240"
+msgstr "Canon BJC-240"
#: src/main/xmli18n-tmp.h:153
-#, fuzzy
msgid "Canon BJC-250"
-msgstr "Canon BJC 250"
+msgstr "Canon BJC-250"
#: src/main/xmli18n-tmp.h:154
-#, fuzzy
msgid "Canon BJC-1000"
-msgstr "Canon BJC 1000"
+msgstr "Canon BJC-1000"
#: src/main/xmli18n-tmp.h:155
-#, fuzzy
msgid "Canon BJC-2000"
-msgstr "Canon BJC 2000"
+msgstr "Canon BJC-2000"
#: src/main/xmli18n-tmp.h:156
-#, fuzzy
msgid "Canon BJC-2010"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2010"
#: src/main/xmli18n-tmp.h:157
-#, fuzzy
msgid "Canon BJC-2100"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2100"
#: src/main/xmli18n-tmp.h:158
-#, fuzzy
msgid "Canon BJC-2110"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2110"
#: src/main/xmli18n-tmp.h:159
-#, fuzzy
msgid "Canon BJC-3000"
-msgstr "Canon BJC 3000"
+msgstr "Canon BJC-3000"
#: src/main/xmli18n-tmp.h:160
-#, fuzzy
msgid "Canon BJC-4000"
-msgstr "Canon BJC 7000"
+msgstr "Canon BJC-4000"
#: src/main/xmli18n-tmp.h:161
-#, fuzzy
msgid "Canon BJC-4300"
-msgstr "Canon BJC 4300"
+msgstr "Canon BJC-4300"
#: src/main/xmli18n-tmp.h:162
-#, fuzzy
msgid "Canon BJC-4400"
-msgstr "Canon BJC 4300"
+msgstr "Canon BJC-4400"
#: src/main/xmli18n-tmp.h:163
-#, fuzzy
msgid "Canon BJC-6000"
-msgstr "Canon BJC 6000"
+msgstr "Canon BJC-6000"
#: src/main/xmli18n-tmp.h:164
-#, fuzzy
msgid "Canon BJC-6100"
-msgstr "Canon BJC 6100"
+msgstr "Canon BJC-6100"
#: src/main/xmli18n-tmp.h:165
-#, fuzzy
msgid "Canon BJC-6200"
-msgstr "Canon BJC 6200"
+msgstr "Canon BJC-6200"
#: src/main/xmli18n-tmp.h:166
-#, fuzzy
msgid "Canon BJC-6500"
-msgstr "Canon BJC 6500"
+msgstr "Canon BJC-6500"
#: src/main/xmli18n-tmp.h:167
-#, fuzzy
msgid "Canon BJC-7000"
-msgstr "Canon BJC 7000"
+msgstr "Canon BJC-7000"
#: src/main/xmli18n-tmp.h:168
-#, fuzzy
msgid "Canon BJC-7100"
-msgstr "Canon BJC 7100"
+msgstr "Canon BJC-7100"
#: src/main/xmli18n-tmp.h:169
-#, fuzzy
msgid "Canon BJC-8200"
-msgstr "Canon BJC 8200"
+msgstr "Canon BJC-8200"
#: src/main/xmli18n-tmp.h:170
-#, fuzzy
msgid "Canon S100"
-msgstr "Canon S200"
+msgstr "Canon S100"
#: src/main/xmli18n-tmp.h:171
msgid "Canon S200"
msgstr "Canon S200"
#: src/main/xmli18n-tmp.h:172
-#, fuzzy
msgid "Canon S300"
-msgstr "Canon S200"
+msgstr "Canon S300"
#: src/main/xmli18n-tmp.h:173
msgid "Canon S400"
@@ -3031,19 +2943,16 @@ msgid "Canon S450"
msgstr "Canon S450"
#: src/main/xmli18n-tmp.h:175
-#, fuzzy
msgid "Canon S500"
-msgstr "Canon S4500"
+msgstr "Canon S500"
#: src/main/xmli18n-tmp.h:176
-#, fuzzy
msgid "Canon S600"
-msgstr "Canon S200"
+msgstr "Canon S600"
#: src/main/xmli18n-tmp.h:177
-#, fuzzy
msgid "Canon S630"
-msgstr "Canon S200"
+msgstr "Canon S630"
#: src/main/xmli18n-tmp.h:178
msgid "Canon S800"
@@ -3054,1228 +2963,1000 @@ msgid "Canon S4500"
msgstr "Canon S4500"
#: src/main/xmli18n-tmp.h:180
-#, fuzzy
msgid "Canon iP4000"
-msgstr "Canon S400"
+msgstr "Canon iP4000"
#: src/main/xmli18n-tmp.h:181
-#, fuzzy
msgid "Epson Stylus C20"
-msgstr "EPSON Stylus C20"
+msgstr "Epson Stylus C20"
#: src/main/xmli18n-tmp.h:182
-#, fuzzy
msgid "Epson Stylus C20SX"
-msgstr "EPSON Stylus C20SX"
+msgstr "Epson Stylus C20SX"
#: src/main/xmli18n-tmp.h:183
-#, fuzzy
msgid "Epson Stylus C20UX"
-msgstr "EPSON Stylus C20UX"
+msgstr "Epson Stylus C20UX"
#: src/main/xmli18n-tmp.h:184
-#, fuzzy
msgid "Epson Stylus C40"
-msgstr "EPSON Stylus C40"
+msgstr "Epson Stylus C40"
#: src/main/xmli18n-tmp.h:185
-#, fuzzy
msgid "Epson Stylus C40SX"
-msgstr "EPSON Stylus C40SX"
+msgstr "Epson Stylus C40SX"
#: src/main/xmli18n-tmp.h:186
-#, fuzzy
msgid "Epson Stylus C40UX"
-msgstr "EPSON Stylus C40UX"
+msgstr "Epson Stylus C40UX"
#: src/main/xmli18n-tmp.h:187
-#, fuzzy
msgid "Epson Stylus C41"
-msgstr "EPSON Stylus C41"
+msgstr "Epson Stylus C41"
#: src/main/xmli18n-tmp.h:188
-#, fuzzy
msgid "Epson Stylus C41SX"
-msgstr "EPSON Stylus C41SX"
+msgstr "Epson Stylus C41SX"
#: src/main/xmli18n-tmp.h:189
-#, fuzzy
msgid "Epson Stylus C41UX"
-msgstr "EPSON Stylus C41UX"
+msgstr "Epson Stylus C41UX"
#: src/main/xmli18n-tmp.h:190
-#, fuzzy
msgid "Epson Stylus C42"
-msgstr "EPSON Stylus C42"
+msgstr "Epson Stylus C42"
#: src/main/xmli18n-tmp.h:191
-#, fuzzy
msgid "Epson Stylus C42SX"
-msgstr "EPSON Stylus C42SX"
+msgstr "Epson Stylus C42SX"
#: src/main/xmli18n-tmp.h:192
-#, fuzzy
msgid "Epson Stylus C42UX"
-msgstr "EPSON Stylus C42UX"
+msgstr "Epson Stylus C42UX"
#: src/main/xmli18n-tmp.h:193
-#, fuzzy
msgid "Epson Stylus C43"
-msgstr "EPSON Stylus C43"
+msgstr "Epson Stylus C43"
#: src/main/xmli18n-tmp.h:194
-#, fuzzy
msgid "Epson Stylus C43SX"
-msgstr "EPSON Stylus C43SX"
+msgstr "Epson Stylus C43SX"
#: src/main/xmli18n-tmp.h:195
-#, fuzzy
msgid "Epson Stylus C43UX"
-msgstr "EPSON Stylus C43UX"
+msgstr "Epson Stylus C43UX"
#: src/main/xmli18n-tmp.h:196
-#, fuzzy
msgid "Epson Stylus C44"
msgstr "EPSON Stylus C44"
#: src/main/xmli18n-tmp.h:197
-#, fuzzy
msgid "Epson Stylus C44SX"
-msgstr "EPSON Stylus C44SX"
+msgstr "Epson Stylus C44SX"
#: src/main/xmli18n-tmp.h:198
-#, fuzzy
msgid "Epson Stylus C44UX"
-msgstr "EPSON Stylus C44UX"
+msgstr "Epson Stylus C44UX"
#: src/main/xmli18n-tmp.h:199
-#, fuzzy
msgid "Epson Stylus C45"
-msgstr "EPSON Stylus C45"
+msgstr "Epson Stylus C45"
#: src/main/xmli18n-tmp.h:200
-#, fuzzy
msgid "Epson Stylus C46"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus C46"
#: src/main/xmli18n-tmp.h:201
-#, fuzzy
msgid "Epson Stylus C48"
-msgstr "EPSON Stylus C48"
+msgstr "Epson Stylus C48"
#: src/main/xmli18n-tmp.h:202
-#, fuzzy
msgid "Epson Stylus C50"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C50"
#: src/main/xmli18n-tmp.h:203
-#, fuzzy
msgid "Epson Stylus C60"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C60"
#: src/main/xmli18n-tmp.h:204
-#, fuzzy
msgid "Epson Stylus C61"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C61"
#: src/main/xmli18n-tmp.h:205
-#, fuzzy
msgid "Epson Stylus C62"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C62"
#: src/main/xmli18n-tmp.h:206
-#, fuzzy
msgid "Epson Stylus C63"
-msgstr "EPSON Stylus C63"
+msgstr "Epson Stylus C63"
#: src/main/xmli18n-tmp.h:207
-#, fuzzy
msgid "Epson Stylus C64"
-msgstr "EPSON Stylus C64"
+msgstr "Epson Stylus C64"
#: src/main/xmli18n-tmp.h:208
-#, fuzzy
msgid "Epson Stylus C65"
-msgstr "EPSON Stylus C65"
+msgstr "Epson Stylus C65"
#: src/main/xmli18n-tmp.h:209
-#, fuzzy
msgid "Epson Stylus C66"
-msgstr "EPSON Stylus C66"
+msgstr "Epson Stylus C66"
#: src/main/xmli18n-tmp.h:210
-#, fuzzy
msgid "Epson Stylus C68"
-msgstr "EPSON Stylus C68"
+msgstr "Epson Stylus C68"
#: src/main/xmli18n-tmp.h:211
-#, fuzzy
msgid "Epson Stylus C70"
-msgstr "Stylus C70"
+msgstr "Epson Stylus C70"
#: src/main/xmli18n-tmp.h:212
-#, fuzzy
msgid "Epson Stylus C80"
-msgstr "Stylus C80"
+msgstr "Epson Stylus C80"
#: src/main/xmli18n-tmp.h:213
-#, fuzzy
msgid "Epson Stylus C82"
-msgstr "Stylus C80"
+msgstr "Epson Stylus C82"
#: src/main/xmli18n-tmp.h:214
-#, fuzzy
msgid "Epson Stylus C83"
-msgstr "EPSON Stylus C83"
+msgstr "Epson Stylus C83"
#: src/main/xmli18n-tmp.h:215
-#, fuzzy
msgid "Epson Stylus C84"
-msgstr "EPSON Stylus C84"
+msgstr "Epson Stylus C84"
#: src/main/xmli18n-tmp.h:216
-#, fuzzy
msgid "Epson Stylus C85"
-msgstr "EPSON Stylus C85"
+msgstr "Epson Stylus C85"
#: src/main/xmli18n-tmp.h:217
-#, fuzzy
msgid "Epson Stylus C86"
-msgstr "EPSON Stylus C86"
+msgstr "Epson Stylus C86"
#: src/main/xmli18n-tmp.h:218
-#, fuzzy
msgid "Epson Stylus C88"
-msgstr "EPSON Stylus C88"
+msgstr "Epson Stylus C88"
#: src/main/xmli18n-tmp.h:219
-#, fuzzy
msgid "Epson Stylus Color"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color"
#: src/main/xmli18n-tmp.h:220
-#, fuzzy
msgid "Epson Stylus Color I"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color I"
#: src/main/xmli18n-tmp.h:221
-#, fuzzy
msgid "Epson Stylus Color II"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color II"
#: src/main/xmli18n-tmp.h:222
-#, fuzzy
msgid "Epson Stylus Color IIs"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color IIs"
#: src/main/xmli18n-tmp.h:223
-#, fuzzy
msgid "Epson Stylus Color PRO"
-msgstr "Stylus Color Pro"
+msgstr "Epson Stylus Color PRO"
#: src/main/xmli18n-tmp.h:224
-#, fuzzy
msgid "Epson Stylus Pro XL"
-msgstr "Stylus Color Pro XL"
+msgstr "Epson Stylus Pro XL"
#: src/main/xmli18n-tmp.h:225
-#, fuzzy
msgid "Epson Stylus Color 400"
-msgstr "Stylus Color 400"
+msgstr "Epson Stylus Color 400"
#: src/main/xmli18n-tmp.h:226
-#, fuzzy
msgid "Epson Stylus Color 440"
-msgstr "Stylus Color 440"
+msgstr "Epson Stylus Color 440"
#: src/main/xmli18n-tmp.h:227
-#, fuzzy
msgid "Epson Stylus Color 460"
-msgstr "Stylus Color 460"
+msgstr "Epson Stylus Color 460"
#: src/main/xmli18n-tmp.h:228
-#, fuzzy
msgid "Epson Stylus Color 480"
-msgstr "Stylus Color 480"
+msgstr "Epson Stylus Color 480"
#: src/main/xmli18n-tmp.h:229
-#, fuzzy
msgid "Epson Stylus Color 500"
-msgstr "Stylus Color 500"
+msgstr "Epson Stylus Color 500"
#: src/main/xmli18n-tmp.h:230
-#, fuzzy
msgid "Epson Stylus Color 580"
-msgstr "Stylus Color 580"
+msgstr "Epson Stylus Color 580"
#: src/main/xmli18n-tmp.h:231
-#, fuzzy
msgid "Epson Stylus Color 600"
-msgstr "Stylus Color 600"
+msgstr "Epson Stylus Color 600"
#: src/main/xmli18n-tmp.h:232
-#, fuzzy
msgid "Epson Stylus Color 640"
-msgstr "Stylus Color 640"
+msgstr "Epson Stylus Color 640"
#: src/main/xmli18n-tmp.h:233
-#, fuzzy
msgid "Epson Stylus Color 660"
-msgstr "Stylus Color 660"
+msgstr "Epson Stylus Color 660"
#: src/main/xmli18n-tmp.h:234
-#, fuzzy
msgid "Epson Stylus Color 670"
-msgstr "Stylus Color 670"
+msgstr "Epson Stylus Color 670"
#: src/main/xmli18n-tmp.h:235
-#, fuzzy
msgid "Epson Stylus Color 680"
-msgstr "Stylus Color 680"
+msgstr "Epson Stylus Color 680"
#: src/main/xmli18n-tmp.h:236
-#, fuzzy
msgid "Epson Stylus Color 740"
-msgstr "Stylus Color 740"
+msgstr "Epson Stylus Color 740"
#: src/main/xmli18n-tmp.h:237
-#, fuzzy
msgid "Epson Stylus Color 760"
-msgstr "Stylus Color 760"
+msgstr "Epson Stylus Color 760"
#: src/main/xmli18n-tmp.h:238
-#, fuzzy
msgid "Epson Stylus Color 777"
-msgstr "Stylus Color 777"
+msgstr "Epson Stylus Color 777"
#: src/main/xmli18n-tmp.h:239
-#, fuzzy
msgid "Epson Stylus Color 800"
-msgstr "Stylus Color 800"
+msgstr "Epson Stylus Color 800"
#: src/main/xmli18n-tmp.h:240
-#, fuzzy
msgid "Epson Stylus Color 850"
-msgstr "Stylus Color 850"
+msgstr "Epson Stylus Color 850"
#: src/main/xmli18n-tmp.h:241
-#, fuzzy
msgid "Epson Stylus Color 860"
-msgstr "Stylus Color 860"
+msgstr "Epson Stylus Color 860"
#: src/main/xmli18n-tmp.h:242
-#, fuzzy
msgid "Epson Stylus Color 880"
-msgstr "Stylus Color 880"
+msgstr "Epson Stylus Color 880"
#: src/main/xmli18n-tmp.h:243
-#, fuzzy
msgid "Epson Stylus Color 8 3"
-msgstr "Stylus Color 83"
+msgstr "Epson Stylus Color 8 3"
#: src/main/xmli18n-tmp.h:244
-#, fuzzy
msgid "Epson Stylus Color 900"
-msgstr "Stylus Color 900"
+msgstr "Epson Stylus Color 900"
#: src/main/xmli18n-tmp.h:245
-#, fuzzy
msgid "Epson Stylus Color 980"
-msgstr "Stylus Color 980"
+msgstr "Epson Stylus Color 980"
#: src/main/xmli18n-tmp.h:246
-#, fuzzy
msgid "Epson Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
#: src/main/xmli18n-tmp.h:247
-#, fuzzy
msgid "Epson Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
#: src/main/xmli18n-tmp.h:248
-#, fuzzy
msgid "Epson Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
#: src/main/xmli18n-tmp.h:249
-#, fuzzy
msgid "Epson Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
#: src/main/xmli18n-tmp.h:250
-#, fuzzy
msgid "Epson Stylus Photo"
-msgstr "Stylus Photo"
+msgstr "Epson Stylus Photo"
#: src/main/xmli18n-tmp.h:251
-#, fuzzy
msgid "Epson Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
#: src/main/xmli18n-tmp.h:252
-#, fuzzy
msgid "Epson Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
#: src/main/xmli18n-tmp.h:253
-#, fuzzy
msgid "Epson Stylus Photo EX3"
-msgstr "EPSON Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
#: src/main/xmli18n-tmp.h:254
-#, fuzzy
msgid "Epson Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
#: src/main/xmli18n-tmp.h:255
-#, fuzzy
msgid "Epson Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
#: src/main/xmli18n-tmp.h:256
-#, fuzzy
msgid "Epson Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
#: src/main/xmli18n-tmp.h:257
-#, fuzzy
msgid "Epson Stylus Photo 785"
-msgstr "Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
#: src/main/xmli18n-tmp.h:258
-#, fuzzy
msgid "Epson Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
#: src/main/xmli18n-tmp.h:259
-#, fuzzy
msgid "Epson Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
#: src/main/xmli18n-tmp.h:260
-#, fuzzy
msgid "Epson Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
#: src/main/xmli18n-tmp.h:261
-#, fuzzy
msgid "Epson Stylus Photo 825"
-msgstr "EPSON Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
#: src/main/xmli18n-tmp.h:262
-#, fuzzy
msgid "Epson Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgstr "Epson Stylus Photo 830"
#: src/main/xmli18n-tmp.h:263
-#, fuzzy
msgid "Epson Stylus Photo 830U"
-msgstr "Stylus Photo 780"
+msgstr "Epson Stylus Photo 830U"
#: src/main/xmli18n-tmp.h:264
-#, fuzzy
msgid "Epson Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
#: src/main/xmli18n-tmp.h:265
-#, fuzzy
msgid "Epson Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
#: src/main/xmli18n-tmp.h:266
-#, fuzzy
msgid "Epson Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
#: src/main/xmli18n-tmp.h:267
-#, fuzzy
msgid "Epson Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
#: src/main/xmli18n-tmp.h:268
-#, fuzzy
msgid "Epson Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo 900"
#: src/main/xmli18n-tmp.h:269
-#, fuzzy
msgid "Epson Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgstr "Epson Stylus Photo 915"
#: src/main/xmli18n-tmp.h:270
-#, fuzzy
msgid "Epson Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgstr "Epson Stylus Photo 925"
#: src/main/xmli18n-tmp.h:271
-#, fuzzy
msgid "Epson Stylus Photo 935"
-msgstr "EPSON Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
#: src/main/xmli18n-tmp.h:272
-#, fuzzy
msgid "Epson Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgstr "Epson Stylus Photo 950"
#: src/main/xmli18n-tmp.h:273
-#, fuzzy
msgid "Epson Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgstr "Epson Stylus Photo 960"
#: src/main/xmli18n-tmp.h:274
-#, fuzzy
msgid "Epson Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
#: src/main/xmli18n-tmp.h:275
-#, fuzzy
msgid "Epson Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
#: src/main/xmli18n-tmp.h:276
-#, fuzzy
msgid "Epson Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
#: src/main/xmli18n-tmp.h:277
-#, fuzzy
msgid "Epson Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
#: src/main/xmli18n-tmp.h:278
-#, fuzzy
msgid "Epson Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
#: src/main/xmli18n-tmp.h:279
-#, fuzzy
msgid "Epson Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo 2100"
#: src/main/xmli18n-tmp.h:280
-#, fuzzy
msgid "Epson Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo 2200"
#: src/main/xmli18n-tmp.h:281
-#, fuzzy
msgid "Epson Stylus Photo R200"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
#: src/main/xmli18n-tmp.h:282
-#, fuzzy
msgid "Epson Stylus Photo R210"
-msgstr "EPSON Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
#: src/main/xmli18n-tmp.h:283
-#, fuzzy
msgid "Epson Stylus Photo R220"
-msgstr "EPSON Stylus Photo R220"
+msgstr "Epson Stylus Photo R220"
#: src/main/xmli18n-tmp.h:284
-#, fuzzy
msgid "Epson Stylus Photo R300"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
#: src/main/xmli18n-tmp.h:285
-#, fuzzy
msgid "Epson Stylus Photo R310"
-msgstr "EPSON Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
#: src/main/xmli18n-tmp.h:286
-#, fuzzy
msgid "Epson Stylus Photo R320"
-msgstr "EPSON Stylus Photo R320"
+msgstr "Epson Stylus Photo R320"
#: src/main/xmli18n-tmp.h:287
-#, fuzzy
msgid "Epson Stylus Photo R340"
-msgstr "EPSON Stylus Photo R340"
+msgstr "Epson Stylus Photo R340"
#: src/main/xmli18n-tmp.h:288
-#, fuzzy
msgid "Epson Stylus Photo RX400"
-msgstr "EPSON Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
#: src/main/xmli18n-tmp.h:289
-#, fuzzy
msgid "Epson Stylus Photo RX420"
-msgstr "EPSON Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
#: src/main/xmli18n-tmp.h:290
-#, fuzzy
msgid "Epson Stylus Photo RX425"
-msgstr "EPSON Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
#: src/main/xmli18n-tmp.h:291
-#, fuzzy
msgid "Epson Stylus Photo RX430"
-msgstr "EPSON Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
#: src/main/xmli18n-tmp.h:292
-#, fuzzy
msgid "Epson Stylus Photo RX500"
-msgstr "EPSON Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
#: src/main/xmli18n-tmp.h:293
-#, fuzzy
msgid "Epson Stylus Photo RX510"
-msgstr "EPSON Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
#: src/main/xmli18n-tmp.h:294
-#, fuzzy
msgid "Epson Stylus Photo RX600"
-msgstr "EPSON Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
#: src/main/xmli18n-tmp.h:295
-#, fuzzy
msgid "Epson Stylus Photo RX620"
-msgstr "EPSON Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
#: src/main/xmli18n-tmp.h:296
-#, fuzzy
msgid "Epson Stylus Photo RX630"
-msgstr "EPSON Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
#: src/main/xmli18n-tmp.h:297
-#, fuzzy
msgid "Epson Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX700"
+msgstr "Epson Stylus Photo RX700"
#: src/main/xmli18n-tmp.h:298
-#, fuzzy
msgid "Epson Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
#: src/main/xmli18n-tmp.h:299
-#, fuzzy
msgid "Epson Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
#: src/main/xmli18n-tmp.h:300
-#, fuzzy
msgid "Epson Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
#: src/main/xmli18n-tmp.h:301
-#, fuzzy
msgid "Epson Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
#: src/main/xmli18n-tmp.h:302
-#, fuzzy
msgid "Epson Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
#: src/main/xmli18n-tmp.h:303
-#, fuzzy
msgid "Epson Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
#: src/main/xmli18n-tmp.h:304
-#, fuzzy
msgid "Epson Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
#: src/main/xmli18n-tmp.h:305
-#, fuzzy
msgid "Epson Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7600"
#: src/main/xmli18n-tmp.h:306
-#, fuzzy
msgid "Epson Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
#: src/main/xmli18n-tmp.h:307
-#, fuzzy
msgid "Epson Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
#: src/main/xmli18n-tmp.h:308
-#, fuzzy
msgid "Epson Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9600"
#: src/main/xmli18n-tmp.h:309
-#, fuzzy
msgid "Epson Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
#: src/main/xmli18n-tmp.h:310
-#, fuzzy
msgid "Epson Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
#: src/main/xmli18n-tmp.h:311
-#, fuzzy
msgid "Epson Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
#: src/main/xmli18n-tmp.h:312
-#, fuzzy
msgid "Epson Stylus CX1500"
-msgstr "EPSON Stylus CX1500"
+msgstr "Epson Stylus CX1500"
#: src/main/xmli18n-tmp.h:313
-#, fuzzy
msgid "Epson Stylus CX3100"
-msgstr "EPSON Stylus CX3100"
+msgstr "Epson Stylus CX3100"
#: src/main/xmli18n-tmp.h:314
-#, fuzzy
msgid "Epson Stylus CX3200"
-msgstr "EPSON Stylus CX3200"
+msgstr "Epson Stylus CX3200"
#: src/main/xmli18n-tmp.h:315
-#, fuzzy
msgid "Epson Stylus CX3500"
-msgstr "EPSON Stylus CX3500"
+msgstr "Epson Stylus CX3500"
#: src/main/xmli18n-tmp.h:316
-#, fuzzy
msgid "Epson Stylus CX3600"
-msgstr "EPSON Stylus CX3600"
+msgstr "Epson Stylus CX3600"
#: src/main/xmli18n-tmp.h:317
-#, fuzzy
msgid "Epson Stylus CX3650"
-msgstr "EPSON Stylus CX3650"
+msgstr "Epson Stylus CX3650"
#: src/main/xmli18n-tmp.h:318
-#, fuzzy
msgid "Epson Stylus CX3700"
-msgstr "EPSON Stylus CX3700"
+msgstr "Epson Stylus CX3100"
#: src/main/xmli18n-tmp.h:319
-#, fuzzy
msgid "Epson Stylus CX3800"
-msgstr "EPSON Stylus CX3800"
+msgstr "Epson Stylus CX3800"
#: src/main/xmli18n-tmp.h:320
-#, fuzzy
msgid "Epson Stylus CX3805"
-msgstr "EPSON Stylus CX3805"
+msgstr "Epson Stylus CX3805"
#: src/main/xmli18n-tmp.h:321
-#, fuzzy
msgid "Epson Stylus CX3810"
-msgstr "EPSON Stylus CX3810"
+msgstr "Epson Stylus CX3810"
#: src/main/xmli18n-tmp.h:322
-#, fuzzy
msgid "Epson Stylus CX4100"
-msgstr "EPSON Stylus CX4100"
+msgstr "Epson Stylus CX4100"
#: src/main/xmli18n-tmp.h:323
-#, fuzzy
msgid "Epson Stylus CX4200"
-msgstr "EPSON Stylus CX4200"
+msgstr "Epson Stylus CX4200"
#: src/main/xmli18n-tmp.h:324
-#, fuzzy
msgid "Epson Stylus CX4500"
-msgstr "EPSON Stylus CX4500"
+msgstr "Epson Stylus CX4500"
#: src/main/xmli18n-tmp.h:325
-#, fuzzy
msgid "Epson Stylus CX4600"
-msgstr "EPSON Stylus CX4600"
+msgstr "Epson Stylus CX4600"
#: src/main/xmli18n-tmp.h:326
-#, fuzzy
msgid "Epson Stylus CX4700"
-msgstr "EPSON Stylus CX4700"
+msgstr "Epson Stylus CX4700"
#: src/main/xmli18n-tmp.h:327
-#, fuzzy
msgid "Epson Stylus CX4800"
-msgstr "EPSON Stylus CX4800"
+msgstr "Epson Stylus CX4800"
#: src/main/xmli18n-tmp.h:328
-#, fuzzy
msgid "Epson Stylus CX5100"
-msgstr "EPSON Stylus CX5100"
+msgstr "Epson Stylus CX5100"
#: src/main/xmli18n-tmp.h:329
-#, fuzzy
msgid "Epson Stylus CX5200"
-msgstr "EPSON Stylus CX5200"
+msgstr "Epson Stylus CX5200"
#: src/main/xmli18n-tmp.h:330
-#, fuzzy
msgid "Epson Stylus CX5300"
-msgstr "EPSON Stylus CX5300"
+msgstr "Epson Stylus CX5300"
#: src/main/xmli18n-tmp.h:331
-#, fuzzy
msgid "Epson Stylus CX5400"
-msgstr "EPSON Stylus CX5400"
+msgstr "Epson Stylus CX5400"
#: src/main/xmli18n-tmp.h:332
-#, fuzzy
msgid "Epson Stylus CX5700"
-msgstr "EPSON Stylus CX5700"
+msgstr "Epson Stylus CX5700"
#: src/main/xmli18n-tmp.h:333
-#, fuzzy
msgid "Epson Stylus CX5800"
-msgstr "EPSON Stylus CX5800"
+msgstr "Epson Stylus CX5800"
#: src/main/xmli18n-tmp.h:334
-#, fuzzy
msgid "Epson Stylus CX6300"
-msgstr "EPSON Stylus CX6300"
+msgstr "Epson Stylus CX6300"
#: src/main/xmli18n-tmp.h:335
-#, fuzzy
msgid "Epson Stylus CX6400"
-msgstr "EPSON Stylus CX6400"
+msgstr "Epson Stylus CX6400"
#: src/main/xmli18n-tmp.h:336
-#, fuzzy
msgid "Epson Stylus CX6500"
-msgstr "EPSON Stylus CX6500"
+msgstr "Epson Stylus CX6500"
#: src/main/xmli18n-tmp.h:337
-#, fuzzy
msgid "Epson Stylus CX6600"
-msgstr "EPSON Stylus CX6600"
+msgstr "Epson Stylus CX6600"
#: src/main/xmli18n-tmp.h:338
-#, fuzzy
msgid "Epson Stylus CX7700"
-msgstr "EPSON Stylus CX7700"
+msgstr "Epson Stylus CX7700"
#: src/main/xmli18n-tmp.h:339
-#, fuzzy
msgid "Epson Stylus CX7800"
-msgstr "EPSON Stylus CX7800"
+msgstr "Epson Stylus CX7800"
#: src/main/xmli18n-tmp.h:340
-#, fuzzy
msgid "Epson Stylus CX8300"
-msgstr "EPSON Stylus CX8300"
+msgstr "Epson Stylus CX8300"
#: src/main/xmli18n-tmp.h:341
-#, fuzzy
msgid "Epson Stylus CX8400"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX8400"
#: src/main/xmli18n-tmp.h:342
-#, fuzzy
msgid "Epson Stylus D68"
-msgstr "EPSON Stylus D68"
+msgstr "Epson Stylus D68"
#: src/main/xmli18n-tmp.h:343
-#, fuzzy
msgid "Epson Stylus D88"
-msgstr "EPSON Stylus D88"
+msgstr "Epson Stylus D88"
#: src/main/xmli18n-tmp.h:344
-#, fuzzy
msgid "Epson Stylus DX3800"
-msgstr "EPSON Stylus DX3800"
+msgstr "Epson Stylus DX3600"
#: src/main/xmli18n-tmp.h:345
-#, fuzzy
msgid "Epson Stylus DX3850"
-msgstr "EPSON Stylus DX3850"
+msgstr "Epson Stylus DX3850"
#: src/main/xmli18n-tmp.h:346
-#, fuzzy
msgid "Epson Stylus DX4200"
-msgstr "EPSON Stylus DX4200"
+msgstr "Epson Stylus DX4200"
#: src/main/xmli18n-tmp.h:347
-#, fuzzy
msgid "Epson Stylus DX4250"
-msgstr "EPSON Stylus DX4250"
+msgstr "Epson Stylus DX4250"
#: src/main/xmli18n-tmp.h:348
-#, fuzzy
msgid "Epson Stylus DX4800"
-msgstr "EPSON Stylus DX4800"
+msgstr "Epson Stylus DX4800"
#: src/main/xmli18n-tmp.h:349
-#, fuzzy
msgid "Epson PictureMate"
-msgstr "EPSON PictureMate"
+msgstr "Epson PictureMate"
#: src/main/xmli18n-tmp.h:350
-#, fuzzy
msgid "Epson PictureMate Deluxe"
-msgstr "EPSON PictureMate Deluxe"
+msgstr "Epson PictureMate Deluxe"
#: src/main/xmli18n-tmp.h:351
-#, fuzzy
msgid "Epson CL 700"
-msgstr "Canon BJC 7000"
+msgstr "Canon CL 700"
#: src/main/xmli18n-tmp.h:352
msgid "Epson CL 750"
-msgstr ""
+msgstr "Epson CL 750"
#: src/main/xmli18n-tmp.h:353
msgid "Epson CL 760"
-msgstr ""
+msgstr "Epson CL 760"
#: src/main/xmli18n-tmp.h:354
msgid "Epson E 100"
-msgstr ""
+msgstr "Epson E 100"
#: src/main/xmli18n-tmp.h:355
msgid "Epson E 150"
-msgstr ""
+msgstr "Epson E 150"
#: src/main/xmli18n-tmp.h:356
msgid "Epson E 200"
-msgstr ""
+msgstr "Epson E 200"
#: src/main/xmli18n-tmp.h:357
-#, fuzzy
msgid "Epson EM 900C"
-msgstr "EPSON EM-900C"
+msgstr "Epson EM 900C"
#: src/main/xmli18n-tmp.h:358
-#, fuzzy
msgid "Epson EM 930C"
-msgstr "EPSON EM-930C"
+msgstr "Epson EM 930C"
#: src/main/xmli18n-tmp.h:359
-#, fuzzy
msgid "Epson MC 2000"
-msgstr "Canon BJC 2000"
+msgstr "Epson MC 2000"
#: src/main/xmli18n-tmp.h:360
-#, fuzzy
msgid "Epson MC 5000"
-msgstr "EPSON MC-5000"
+msgstr "Epson MC 5000"
#: src/main/xmli18n-tmp.h:361
-#, fuzzy
msgid "Epson MC 7000"
-msgstr "Canon BJC 7000"
+msgstr "Epson MC 7000"
#: src/main/xmli18n-tmp.h:362
-#, fuzzy
msgid "Epson MC 9000"
-msgstr "EPSON MC-9000"
+msgstr "Epson MC 9000"
#: src/main/xmli18n-tmp.h:363
-#, fuzzy
msgid "Epson MC 10000"
-msgstr "Canon BJC 1000"
+msgstr "Epson MC 10000"
#: src/main/xmli18n-tmp.h:364
-#, fuzzy
msgid "Epson MJ 930C"
-msgstr "EPSON MJ-930C"
+msgstr "Epson MJ 930C"
#: src/main/xmli18n-tmp.h:365
-#, fuzzy
msgid "Epson MJ 5100C"
-msgstr "EPSON MJ-5100C"
+msgstr "Epson MJ 5100C"
#: src/main/xmli18n-tmp.h:366
-#, fuzzy
msgid "Epson MJ 6000C"
-msgstr "Canon BJC 6000"
+msgstr "Epson MJ 6000C"
#: src/main/xmli18n-tmp.h:367
-#, fuzzy
msgid "Epson MJ 8000C"
-msgstr "EPSON MJ-8000C"
+msgstr "Epson MJ 8000C"
#: src/main/xmli18n-tmp.h:368
-#, fuzzy
msgid "Epson PM 700C"
-msgstr "EPSON PM-700C"
+msgstr "Epson PM 700C"
#: src/main/xmli18n-tmp.h:369
-#, fuzzy
msgid "Epson PM 730C"
-msgstr "EPSON PM-730C"
+msgstr "Epson PM 730C"
#: src/main/xmli18n-tmp.h:370
-#, fuzzy
msgid "Epson PM 740C"
-msgstr "EPSON PM-740C"
+msgstr "Epson PM 740C"
#: src/main/xmli18n-tmp.h:371
-#, fuzzy
msgid "Epson PM 750C"
-msgstr "EPSON PM-750C"
+msgstr "Epson PM 750C"
#: src/main/xmli18n-tmp.h:372
-#, fuzzy
msgid "Epson PM 760C"
-msgstr "EPSON PM-760C"
+msgstr "Epson PM 760C"
#: src/main/xmli18n-tmp.h:373
-#, fuzzy
msgid "Epson PM 770C"
-msgstr "EPSON PM-770C"
+msgstr "Epson PM 770C"
#: src/main/xmli18n-tmp.h:374
-#, fuzzy
msgid "Epson PM 780C"
-msgstr "EPSON PM-780C"
+msgstr "Epson PM 780C"
#: src/main/xmli18n-tmp.h:375
-#, fuzzy
msgid "Epson PM 790PT"
-msgstr "EPSON PM-790PT"
+msgstr "Epson PM 790PT"
#: src/main/xmli18n-tmp.h:376
-#, fuzzy
msgid "Epson PM 800C"
-msgstr "EPSON PM-800C"
+msgstr "Epson PM 800C"
#: src/main/xmli18n-tmp.h:377
-#, fuzzy
msgid "Epson PM 850PT"
-msgstr "EPSON PM-850PT"
+msgstr "Epson PM 850PT"
#: src/main/xmli18n-tmp.h:378
-#, fuzzy
msgid "Epson PM 870C"
-msgstr "EPSON PM-870C"
+msgstr "Epson PM 870C"
#: src/main/xmli18n-tmp.h:379
-#, fuzzy
msgid "Epson PM 880C"
-msgstr "EPSON PM-880C"
+msgstr "Epson PM 880C"
#: src/main/xmli18n-tmp.h:380
-#, fuzzy
msgid "Epson PM 930C"
-msgstr "EPSON PM-930C"
+msgstr "Epson PM 930C"
#: src/main/xmli18n-tmp.h:381
-#, fuzzy
msgid "Epson PM 940C"
-msgstr "EPSON PM-940C"
+msgstr "Epson PM 940C"
#: src/main/xmli18n-tmp.h:382
-#, fuzzy
msgid "Epson PM 950C"
-msgstr "EPSON PM-950C"
+msgstr "Epson PM 950C"
#: src/main/xmli18n-tmp.h:383
-#, fuzzy
msgid "Epson PM 970C"
-msgstr "EPSON PM-970C"
+msgstr "Epson PM 970C"
#: src/main/xmli18n-tmp.h:384
-#, fuzzy
msgid "Epson PM 980C"
-msgstr "EPSON PM-980C"
+msgstr "Epson PM 980C"
#: src/main/xmli18n-tmp.h:385
-#, fuzzy
msgid "Epson PM 2000C"
-msgstr "EPSON PM-2000C"
+msgstr "Epson PM 2000C"
#: src/main/xmli18n-tmp.h:386
-#, fuzzy
msgid "Epson PM 2200C"
-msgstr "EPSON PM-2200C"
+msgstr "Epson PM 2200C"
#: src/main/xmli18n-tmp.h:387
-#, fuzzy
msgid "Epson PM 3000C"
-msgstr "EPSON PM-3000C"
+msgstr "Epson PM 3000C"
#: src/main/xmli18n-tmp.h:388
-#, fuzzy
msgid "Epson PM 3300C"
-msgstr "EPSON PM-3300C"
+msgstr "Epson PM 3300C"
#: src/main/xmli18n-tmp.h:389
-#, fuzzy
msgid "Epson PM 3500C"
-msgstr "EPSON PM-3500C"
+msgstr "Epson PM 3500C"
#: src/main/xmli18n-tmp.h:390
-#, fuzzy
msgid "Epson PM 3700C"
-msgstr "EPSON PM-3700C"
+msgstr "Epson PM 3700C"
#: src/main/xmli18n-tmp.h:391
-#, fuzzy
msgid "Epson PM 4000PX"
-msgstr "EPSON PM-4000PX"
+msgstr "Epson PM 4000PX"
#: src/main/xmli18n-tmp.h:392
-#, fuzzy
msgid "Epson PM 5000C"
-msgstr "EPSON PM-5000C"
+msgstr "Epson PM 5000C"
#: src/main/xmli18n-tmp.h:393
-#, fuzzy
msgid "Epson PM 7000C"
-msgstr "EPSON PM-7000C"
+msgstr "Epson PM 7000C"
#: src/main/xmli18n-tmp.h:394
-#, fuzzy
msgid "Epson PM 9000C"
-msgstr "EPSON PM-9000C"
+msgstr "Epson PM 9000C"
#: src/main/xmli18n-tmp.h:395
-#, fuzzy
msgid "Epson PM 10000"
-msgstr "EPSON PM-10000"
+msgstr "Epson PM 10000"
#: src/main/xmli18n-tmp.h:396
msgid "Epson PM A650"
-msgstr ""
+msgstr "Epson PM A650"
#: src/main/xmli18n-tmp.h:397
msgid "Epson PM A750"
-msgstr ""
+msgstr "Epson PM A750"
#: src/main/xmli18n-tmp.h:398
msgid "Epson PM A890"
-msgstr ""
+msgstr "Epson PM A890"
#: src/main/xmli18n-tmp.h:399
-#, fuzzy
msgid "Epson PM A900"
-msgstr "EPSON PM-A900"
+msgstr "Epson PM A900"
#: src/main/xmli18n-tmp.h:400
msgid "Epson PM A950"
-msgstr ""
+msgstr "Epson PM A950"
#: src/main/xmli18n-tmp.h:401
msgid "Epson PM D600"
-msgstr ""
+msgstr "Epson PM D600"
#: src/main/xmli18n-tmp.h:402
-#, fuzzy
msgid "Epson PM D750"
-msgstr "EPSON PM-D750"
+msgstr "Epson PM D750"
#: src/main/xmli18n-tmp.h:403
-#, fuzzy
msgid "Epson PM D770"
-msgstr "EPSON PM-D770"
+msgstr "Epson PM D770"
#: src/main/xmli18n-tmp.h:404
msgid "Epson PM D800"
-msgstr ""
+msgstr "Epson PM D800"
#: src/main/xmli18n-tmp.h:405
-#, fuzzy
msgid "Epson PM D1000"
-msgstr "EPSON PM-D1000"
+msgstr "Epson PM D1000"
#: src/main/xmli18n-tmp.h:406
-#, fuzzy
msgid "Epson PM G700"
-msgstr "EPSON PM-G700"
+msgstr "Epson PM G700"
#: src/main/xmli18n-tmp.h:407
-#, fuzzy
msgid "Epson PM G720"
-msgstr "EPSON PM-G720"
+msgstr "Epson PM G720"
#: src/main/xmli18n-tmp.h:408
msgid "Epson PM G730"
-msgstr ""
+msgstr "Epson PM G730"
#: src/main/xmli18n-tmp.h:409
-#, fuzzy
msgid "Epson PM G800"
-msgstr "EPSON PM-G800"
+msgstr "Epson PM G800"
#: src/main/xmli18n-tmp.h:410
-#, fuzzy
msgid "Epson PM G820"
-msgstr "EPSON PM-G820"
+msgstr "Epson PM G820"
#: src/main/xmli18n-tmp.h:411
-#, fuzzy
msgid "Epson PX A650"
-msgstr "EPSON PX-A650"
+msgstr "Epson PX A650"
#: src/main/xmli18n-tmp.h:412
-#, fuzzy
msgid "Epson PX G900"
-msgstr "EPSON PX-G900"
+msgstr "Epson PX G900"
#: src/main/xmli18n-tmp.h:413
-#, fuzzy
msgid "Epson PX G920"
-msgstr "EPSON PX-G920"
+msgstr "Epson PX G920"
#: src/main/xmli18n-tmp.h:414
-#, fuzzy
msgid "Epson PX G5000"
-msgstr "EPSON PX-G5000"
+msgstr "Epson PX G5000"
#: src/main/xmli18n-tmp.h:415
-#, fuzzy
msgid "Epson PX V500"
-msgstr "EPSON PX-V500"
+msgstr "Epson PX V500"
#: src/main/xmli18n-tmp.h:416
-#, fuzzy
msgid "Epson PX V600"
-msgstr "EPSON PX-V600"
+msgstr "Epson PX V600"
#: src/main/xmli18n-tmp.h:417
msgid "Epson PX V630"
-msgstr ""
+msgstr "Epson PX V630"
#: src/main/xmli18n-tmp.h:418
-#, fuzzy
msgid "Epson PX 5500"
-msgstr "EPSON PX-5500"
+msgstr "Epson PX 5500"
#: src/main/xmli18n-tmp.h:419
-#, fuzzy
msgid "Epson PX 7000"
-msgstr "EPSON PX-7000"
+msgstr "Epson PX 7000"
#: src/main/xmli18n-tmp.h:420
-#, fuzzy
msgid "Epson PX 9000"
-msgstr "EPSON PX-9000"
+msgstr "Epson PX 9000"
#: src/main/xmli18n-tmp.h:421
msgid "Apollo P-2100"
-msgstr ""
+msgstr "Apollo P-2100"
#: src/main/xmli18n-tmp.h:422
msgid "Apollo P-2150"
-msgstr ""
+msgstr "Apollo P-2150"
#: src/main/xmli18n-tmp.h:423
msgid "Apollo P-2200"
-msgstr ""
+msgstr "Apollo P-2200"
#: src/main/xmli18n-tmp.h:424
msgid "Apollo P-2250"
-msgstr ""
+msgstr "Apollo P-2250"
#: src/main/xmli18n-tmp.h:425
msgid "Apollo P-2500"
-msgstr ""
+msgstr "Apollo P-2500"
#: src/main/xmli18n-tmp.h:426
msgid "Apollo P-2550"
-msgstr ""
+msgstr "Apollo P-2550"
#: src/main/xmli18n-tmp.h:427
msgid "Apollo P-2600"
-msgstr ""
+msgstr "Apollo P-2600"
#: src/main/xmli18n-tmp.h:428
msgid "Apollo P-2650"
-msgstr ""
+msgstr "Apollo P-2650"
#: src/main/xmli18n-tmp.h:429
msgid "Apple Color StyleWriter 4100"
@@ -4291,333 +3972,311 @@ msgstr "Apple Color StyleWriter 6500"
#: src/main/xmli18n-tmp.h:432
msgid "Apple LaserWriter Select 360"
-msgstr ""
+msgstr "Apple LaserWriter Select 360"
#: src/main/xmli18n-tmp.h:433
msgid "Brother DCP-1200"
-msgstr ""
+msgstr "Brother DCP-1200"
#: src/main/xmli18n-tmp.h:434
msgid "Brother HL-4Ve"
-msgstr ""
+msgstr "Brother HL-4Ve"
#: src/main/xmli18n-tmp.h:435
msgid "Brother HL-10V"
-msgstr ""
+msgstr "Brother HL-10V"
#: src/main/xmli18n-tmp.h:436
msgid "Brother HL-10h"
-msgstr ""
+msgstr "Brother HL-10h"
#: src/main/xmli18n-tmp.h:437
msgid "Brother HL-630"
-msgstr ""
+msgstr "Brother HL-630"
#: src/main/xmli18n-tmp.h:438
msgid "Brother HL-660"
-msgstr ""
+msgstr "Brother HL-660"
#: src/main/xmli18n-tmp.h:439
msgid "Brother HL-760"
-msgstr ""
+msgstr "Brother HL-760"
#: src/main/xmli18n-tmp.h:440
msgid "Brother HL-960"
-msgstr ""
+msgstr "Brother HL-960"
#: src/main/xmli18n-tmp.h:441
msgid "Brother HL-1040"
-msgstr ""
+msgstr "Brother HL-1040"
#: src/main/xmli18n-tmp.h:442
msgid "Brother HL-1050"
-msgstr ""
+msgstr "Brother HL-1050"
#: src/main/xmli18n-tmp.h:443
msgid "Brother HL-1060"
-msgstr ""
+msgstr "Brother HL-1060"
#: src/main/xmli18n-tmp.h:444
msgid "Brother HL-1070"
-msgstr ""
+msgstr "Brother HL-1070"
#: src/main/xmli18n-tmp.h:445
msgid "Brother HL-1240"
-msgstr ""
+msgstr "Brother HL-1240"
#: src/main/xmli18n-tmp.h:446
msgid "Brother HL-1250"
-msgstr ""
+msgstr "Brother HL-1250"
#: src/main/xmli18n-tmp.h:447
msgid "Brother HL-1260"
-msgstr ""
+msgstr "Brother HL-1260"
#: src/main/xmli18n-tmp.h:448
msgid "Brother HL-1270N"
-msgstr ""
+msgstr "Brother HL-1270N"
#: src/main/xmli18n-tmp.h:449
msgid "Brother HL-1440"
-msgstr ""
+msgstr "Brother HL-1440"
#: src/main/xmli18n-tmp.h:450
msgid "Brother HL-1660e"
-msgstr ""
+msgstr "Brother HL-1660e"
#: src/main/xmli18n-tmp.h:451
msgid "Brother HL-2060"
-msgstr ""
+msgstr "Brother HL-2060"
#: src/main/xmli18n-tmp.h:452
msgid "Brother MFC-6550MC"
-msgstr ""
+msgstr "Brother MFC-6550MC"
#: src/main/xmli18n-tmp.h:453
msgid "Brother MFC-8300"
-msgstr ""
+msgstr "Brother MFC-8300"
#: src/main/xmli18n-tmp.h:454
msgid "Brother MFC-9500"
-msgstr ""
+msgstr "Brother MFC-9500"
#: src/main/xmli18n-tmp.h:455
msgid "Brother MFC-9600"
-msgstr ""
+msgstr "Brother MFC-9600"
#: src/main/xmli18n-tmp.h:456
-#, fuzzy
msgid "Canon GP 335"
-msgstr "Canon BJC 85"
+msgstr "Canon GP 335"
#: src/main/xmli18n-tmp.h:457
-#, fuzzy
msgid "Canon LBP-4sx"
-msgstr "Canon BJC 240"
+msgstr "Canon LBP-4sx"
#: src/main/xmli18n-tmp.h:458
-#, fuzzy
msgid "Canon LBP-430"
-msgstr "Canon BJC 4300"
+msgstr "Canon LBP-430"
#: src/main/xmli18n-tmp.h:459
-#, fuzzy
msgid "Canon LBP-1000"
-msgstr "Canon CP100"
+msgstr "Canon LBP-1000"
#: src/main/xmli18n-tmp.h:460
-#, fuzzy
msgid "Canon LBP-1260"
-msgstr "Canon CP220"
+msgstr "Canon LBP-1260"
#: src/main/xmli18n-tmp.h:461
-#, fuzzy
msgid "Canon LBP-1760"
-msgstr "Canon CP100"
+msgstr "Canon LBP-1760"
#: src/main/xmli18n-tmp.h:462
msgid "Canon imageRunner 330s"
-msgstr ""
+msgstr "Canon imageRunner 330s"
#: src/main/xmli18n-tmp.h:463
msgid "Citizen ProJet II"
-msgstr ""
+msgstr "Citizen ProJet II"
#: src/main/xmli18n-tmp.h:464
msgid "DEC 1800"
-msgstr ""
+msgstr "DEC 1800"
#: src/main/xmli18n-tmp.h:465
msgid "DEC LN17"
-msgstr ""
+msgstr "DEC LN17"
#: src/main/xmli18n-tmp.h:466
msgid "Epson ActionLaser 1100"
-msgstr ""
+msgstr "Epson ActionLaser 1100"
#: src/main/xmli18n-tmp.h:467
msgid "Epson ActionLaser II"
-msgstr ""
+msgstr "Epson ActionLaser II"
#: src/main/xmli18n-tmp.h:468
msgid "Epson AcuLaser C2000"
-msgstr ""
+msgstr "Epson AcuLaser C2000"
#: src/main/xmli18n-tmp.h:469
msgid "Epson AcuLaser C2000PS"
-msgstr ""
+msgstr "Epson AcuLaser C2000PS"
#: src/main/xmli18n-tmp.h:470
msgid "Epson AcuLaser C8500"
-msgstr ""
+msgstr "Epson AcuLaser C8500"
#: src/main/xmli18n-tmp.h:471
msgid "Epson AcuLaser C8500PS"
-msgstr ""
+msgstr "Epson AcuLaser C8500PS"
#: src/main/xmli18n-tmp.h:472
msgid "Epson AcuLaser C8600"
-msgstr ""
+msgstr "Epson AcuLaser C8600"
#: src/main/xmli18n-tmp.h:473
msgid "Epson AcuLaser C8600PS"
-msgstr ""
+msgstr "Epson AcuLaser C8600PS"
#: src/main/xmli18n-tmp.h:474
msgid "Epson EPL-5200"
-msgstr ""
+msgstr "Epson EPL-5200"
#: src/main/xmli18n-tmp.h:475
msgid "Epson EPL-5200+"
-msgstr ""
+msgstr "Epson EPL-5200+"
#: src/main/xmli18n-tmp.h:476
msgid "Epson EPL-5700"
-msgstr ""
+msgstr "Epson EPL-5700"
#: src/main/xmli18n-tmp.h:477
msgid "Epson EPL-5700PS"
-msgstr ""
+msgstr "Epson EPL-5700PS"
#: src/main/xmli18n-tmp.h:478
msgid "Epson EPL-5800"
-msgstr ""
+msgstr "Epson EPL-5800"
#: src/main/xmli18n-tmp.h:479
msgid "Epson EPL-5800PS"
-msgstr ""
+msgstr "Epson EPL-5800PS"
#: src/main/xmli18n-tmp.h:480
msgid "Epson EPL-5900"
-msgstr ""
+msgstr "Epson EPL-5900"
#: src/main/xmli18n-tmp.h:481
msgid "Epson EPL-5900PS"
-msgstr ""
+msgstr "Epson EPL-5900PS"
#: src/main/xmli18n-tmp.h:482
msgid "Epson EPL-6100"
-msgstr ""
+msgstr "Epson EPL-6100"
#: src/main/xmli18n-tmp.h:483
msgid "Epson EPL-6100PS"
-msgstr ""
+msgstr "Epson EPL-6100PS"
#: src/main/xmli18n-tmp.h:484
msgid "Epson EPL-7100"
-msgstr ""
+msgstr "Epson EPL-7100"
#: src/main/xmli18n-tmp.h:485
msgid "Fujitsu PrintPartner 10V"
-msgstr ""
+msgstr "Fujitsu PrintPartner 10V"
#: src/main/xmli18n-tmp.h:486
msgid "Fujitsu PrintPartner 16DV"
-msgstr ""
+msgstr "Fujitsu PrintPartner 16DV"
#: src/main/xmli18n-tmp.h:487
msgid "Fujitsu PrintPartner 20W"
-msgstr ""
+msgstr "Fujitsu PrintPartner 20W"
#: src/main/xmli18n-tmp.h:488
msgid "Fujitsu PrintPartner 8000"
-msgstr ""
+msgstr "Fujitsu PrintPartner 8000"
#: src/main/xmli18n-tmp.h:489
-#, fuzzy
msgid "Generic PCL 4 Printer"
-msgstr "Définir une nouvelle imprimante"
+msgstr "Imprimante générique PCL 4"
#: src/main/xmli18n-tmp.h:490
-#, fuzzy
msgid "Generic PCL 5 Printer"
-msgstr "Définir une nouvelle imprimante"
+msgstr "Imprimante générique PCL 5"
#: src/main/xmli18n-tmp.h:491
-#, fuzzy
msgid "Generic PCL 5c Printer"
-msgstr "Définir une nouvelle imprimante"
+msgstr "Imprimante générique PCL5 c"
#: src/main/xmli18n-tmp.h:492
-#, fuzzy
msgid "Generic PCL 5e Printer"
-msgstr "Définir une nouvelle imprimante"
+msgstr "Imprimante générique PCL 5e"
#: src/main/xmli18n-tmp.h:493
msgid "Generic PCL 6/PCL XL Printer"
-msgstr ""
+msgstr "Imprimante générique PCL 6/PCL XL"
#: src/main/xmli18n-tmp.h:494
-#, fuzzy
msgid "HP Business Inkjet 2200"
-msgstr "HP DeskJet 1200C"
+msgstr "HP Business Inkjet 2200"
#: src/main/xmli18n-tmp.h:495
-#, fuzzy
msgid "HP Business Inkjet 2230"
-msgstr "HP DesignJet 230"
+msgstr "HP Business Inkjet 2230"
#: src/main/xmli18n-tmp.h:496
-#, fuzzy
msgid "HP Business Inkjet 2250"
-msgstr "HP DeskJet 1220C"
+msgstr "HP Business Inkjet 2250"
#: src/main/xmli18n-tmp.h:497
msgid "HP Business Inkjet 2250TN"
-msgstr ""
+msgstr "HP Business Inkjet 2250TN"
#: src/main/xmli18n-tmp.h:498
-#, fuzzy
msgid "HP Business Inkjet 2280"
-msgstr "HP DeskJet 1220C"
+msgstr "HP Business Inkjet 2280"
#: src/main/xmli18n-tmp.h:499
msgid "HP Color Inkjet Printer CP1160"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1160"
#: src/main/xmli18n-tmp.h:500
msgid "HP Color Inkjet Printer CP1700"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1700"
#: src/main/xmli18n-tmp.h:501
-#, fuzzy
msgid "HP Color LaserJet 2500"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 2500"
#: src/main/xmli18n-tmp.h:502
-#, fuzzy
msgid "HP Color LaserJet 4500"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4500"
#: src/main/xmli18n-tmp.h:503
-#, fuzzy
msgid "HP Color LaserJet 4550"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4550"
#: src/main/xmli18n-tmp.h:504
-#, fuzzy
msgid "HP Color LaserJet 4600"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4600"
#: src/main/xmli18n-tmp.h:505
-#, fuzzy
msgid "HP Color LaserJet 5"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5"
#: src/main/xmli18n-tmp.h:506
-#, fuzzy
msgid "HP Color LaserJet 5000"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5000"
#: src/main/xmli18n-tmp.h:507
-#, fuzzy
msgid "HP Color LaserJet 5500"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5500"
#: src/main/xmli18n-tmp.h:508
-#, fuzzy
msgid "HP Color LaserJet 8550GN"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 8550GN"
#: src/main/xmli18n-tmp.h:509
msgid "HP DesignJet 230"
@@ -4648,42 +4307,36 @@ msgid "HP DesignJet 700"
msgstr "HP DesignJet 700"
#: src/main/xmli18n-tmp.h:516
-#, fuzzy
msgid "HP DesignJet 750C Plus"
-msgstr "HP DesignJet 750C"
+msgstr "HP DesignJet 750C Plus"
#: src/main/xmli18n-tmp.h:517
msgid "HP DesignJet 750C"
msgstr "HP DesignJet 750C"
#: src/main/xmli18n-tmp.h:518
-#, fuzzy
msgid "HP DesignJet 2500CP"
-msgstr "HP DesignJet 2500C"
+msgstr "HP DesignJet 2500CP"
#: src/main/xmli18n-tmp.h:519
-#, fuzzy
msgid "HP DesignJet 3500CP"
-msgstr "HP DesignJet 3500C"
+msgstr "HP DesignJet 3500CP"
#: src/main/xmli18n-tmp.h:520
-#, fuzzy
msgid "HP DesignJet ColorPro CAD"
-msgstr "HP DesignJet 455CA"
+msgstr "HP DesignJet ColorPro CAD"
#: src/main/xmli18n-tmp.h:521
msgid "HP DeskJet 400"
msgstr "HP DeskJet 400"
#: src/main/xmli18n-tmp.h:522
-#, fuzzy
msgid "HP DeskJet 420C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 420C"
#: src/main/xmli18n-tmp.h:523
-#, fuzzy
msgid "HP DeskJet 450"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 450"
#: src/main/xmli18n-tmp.h:524
msgid "HP DeskJet 500"
@@ -4694,14 +4347,12 @@ msgid "HP DeskJet 500C"
msgstr "HP DeskJet 500C"
#: src/main/xmli18n-tmp.h:526
-#, fuzzy
msgid "HP DeskJet 505J Plus"
-msgstr "HP DeskJet 520"
+msgstr "HP DeskJet 505J Plus"
#: src/main/xmli18n-tmp.h:527
-#, fuzzy
msgid "HP DeskJet 510"
-msgstr "HP DeskJet 500"
+msgstr "HP DeskJet 510"
#: src/main/xmli18n-tmp.h:528
msgid "HP DeskJet 520"
@@ -4716,123 +4367,100 @@ msgid "HP DeskJet 550C"
msgstr "HP DeskJet 550C"
#: src/main/xmli18n-tmp.h:531
-#, fuzzy
msgid "HP DeskJet 5550"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 5500"
#: src/main/xmli18n-tmp.h:532
-#, fuzzy
msgid "HP DeskJet 5551"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 5551"
#: src/main/xmli18n-tmp.h:533
msgid "HP DeskJet 560C"
msgstr "HP DeskJet 560C"
#: src/main/xmli18n-tmp.h:534
-#, fuzzy
msgid "HP DeskJet 600"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 600"
#: src/main/xmli18n-tmp.h:535
-#, fuzzy
msgid "HP DeskJet 600C"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 600C"
#: src/main/xmli18n-tmp.h:536
-#, fuzzy
msgid "HP DeskJet 610C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 610C"
#: src/main/xmli18n-tmp.h:537
-#, fuzzy
msgid "HP DeskJet 610CL"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 610CL"
#: src/main/xmli18n-tmp.h:538
-#, fuzzy
msgid "HP DeskJet 6122"
-msgstr "HP DeskJet 1220C"
+msgstr "HP DeskJet 6122"
#: src/main/xmli18n-tmp.h:539
-#, fuzzy
msgid "HP DeskJet 6127"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 6127"
#: src/main/xmli18n-tmp.h:540
-#, fuzzy
msgid "HP DeskJet 612C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 612C"
#: src/main/xmli18n-tmp.h:541
-#, fuzzy
msgid "HP DeskJet 640C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 640C"
#: src/main/xmli18n-tmp.h:542
-#, fuzzy
msgid "HP DeskJet 648C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 648C"
#: src/main/xmli18n-tmp.h:543
-#, fuzzy
msgid "HP DeskJet 660C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 660C"
#: src/main/xmli18n-tmp.h:544
-#, fuzzy
msgid "HP DeskJet 670C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 670C"
#: src/main/xmli18n-tmp.h:545
-#, fuzzy
msgid "HP DeskJet 670TV"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 670TV"
#: src/main/xmli18n-tmp.h:546
-#, fuzzy
msgid "HP DeskJet 672C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 672C"
#: src/main/xmli18n-tmp.h:547
-#, fuzzy
msgid "HP DeskJet 680C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 680C"
#: src/main/xmli18n-tmp.h:548
-#, fuzzy
msgid "HP DeskJet 682C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 682C"
#: src/main/xmli18n-tmp.h:549
-#, fuzzy
msgid "HP DeskJet 690C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 690C"
#: src/main/xmli18n-tmp.h:550
-#, fuzzy
msgid "HP DeskJet 692C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 692C"
#: src/main/xmli18n-tmp.h:551
-#, fuzzy
msgid "HP DeskJet 693C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 693C"
#: src/main/xmli18n-tmp.h:552
-#, fuzzy
msgid "HP DeskJet 694C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 694C"
#: src/main/xmli18n-tmp.h:553
-#, fuzzy
msgid "HP DeskJet 695C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 695C"
#: src/main/xmli18n-tmp.h:554
-#, fuzzy
msgid "HP DeskJet 697C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 697C"
#: src/main/xmli18n-tmp.h:555
msgid "HP DeskJet 810C"
@@ -4843,47 +4471,40 @@ msgid "HP DeskJet 812C"
msgstr "HP DeskJet 812C"
#: src/main/xmli18n-tmp.h:557
-#, fuzzy
msgid "HP DeskJet 815C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 815C"
#: src/main/xmli18n-tmp.h:558
-#, fuzzy
msgid "HP DeskJet 816C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 816C"
#: src/main/xmli18n-tmp.h:559
-#, fuzzy
msgid "HP DeskJet 825C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 825C"
#: src/main/xmli18n-tmp.h:560
-#, fuzzy
msgid "HP DeskJet 830C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 830C"
#: src/main/xmli18n-tmp.h:561
-#, fuzzy
msgid "HP DeskJet 832C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 832C"
#: src/main/xmli18n-tmp.h:562
msgid "HP DeskJet 840C"
msgstr "HP DeskJet 840C"
#: src/main/xmli18n-tmp.h:563
-#, fuzzy
msgid "HP DeskJet 841C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 841C"
#: src/main/xmli18n-tmp.h:564
msgid "HP DeskJet 842C"
msgstr "HP DeskJet 842C"
#: src/main/xmli18n-tmp.h:565
-#, fuzzy
msgid "HP DeskJet 843C"
-msgstr "HP DeskJet 840C"
+msgstr "HP DeskJet 843C"
#: src/main/xmli18n-tmp.h:566
msgid "HP DeskJet 845C"
@@ -4902,14 +4523,12 @@ msgid "HP DeskJet 870C"
msgstr "HP DeskJet 870C"
#: src/main/xmli18n-tmp.h:570
-#, fuzzy
msgid "HP DeskJet 880C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 880C"
#: src/main/xmli18n-tmp.h:571
-#, fuzzy
msgid "HP DeskJet 882C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 882C"
#: src/main/xmli18n-tmp.h:572
msgid "HP DeskJet 890C"
@@ -4920,109 +4539,88 @@ msgid "HP DeskJet 895C"
msgstr "HP DeskJet 895C"
#: src/main/xmli18n-tmp.h:574
-#, fuzzy
msgid "HP DeskJet 916C"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 916C"
#: src/main/xmli18n-tmp.h:575
-#, fuzzy
msgid "HP DeskJet 920C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 920C"
#: src/main/xmli18n-tmp.h:576
-#, fuzzy
msgid "HP DeskJet 9300"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 9300"
#: src/main/xmli18n-tmp.h:577
-#, fuzzy
msgid "HP DeskJet 930C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 930C"
#: src/main/xmli18n-tmp.h:578
-#, fuzzy
msgid "HP DeskJet 932C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 932C"
#: src/main/xmli18n-tmp.h:579
-#, fuzzy
msgid "HP DeskJet 933C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 933C"
#: src/main/xmli18n-tmp.h:580
-#, fuzzy
msgid "HP DeskJet 934C"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 934C"
#: src/main/xmli18n-tmp.h:581
-#, fuzzy
msgid "HP DeskJet 935C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 935C"
#: src/main/xmli18n-tmp.h:582
-#, fuzzy
msgid "HP DeskJet 940C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 940C"
#: src/main/xmli18n-tmp.h:583
-#, fuzzy
msgid "HP DeskJet 948C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 948C"
#: src/main/xmli18n-tmp.h:584
-#, fuzzy
msgid "HP DeskJet 950C"
-msgstr "HP DeskJet 500C"
+msgstr "HP DeskJet 950C"
#: src/main/xmli18n-tmp.h:585
-#, fuzzy
msgid "HP DeskJet 952C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 952C"
#: src/main/xmli18n-tmp.h:586
-#, fuzzy
msgid "HP DeskJet 955C"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 955C"
#: src/main/xmli18n-tmp.h:587
-#, fuzzy
msgid "HP DeskJet 957C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 957C"
#: src/main/xmli18n-tmp.h:588
-#, fuzzy
msgid "HP DeskJet 959C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 959C"
#: src/main/xmli18n-tmp.h:589
-#, fuzzy
msgid "HP DeskJet 960C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 960C"
#: src/main/xmli18n-tmp.h:590
-#, fuzzy
msgid "HP DeskJet 970C"
-msgstr "HP DeskJet 870C"
+msgstr "HP DeskJet 970C"
#: src/main/xmli18n-tmp.h:591
-#, fuzzy
msgid "HP DeskJet 975C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 975C"
#: src/main/xmli18n-tmp.h:592
-#, fuzzy
msgid "HP DeskJet 980C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 980C"
#: src/main/xmli18n-tmp.h:593
-#, fuzzy
msgid "HP DeskJet 990C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 990C"
#: src/main/xmli18n-tmp.h:594
-#, fuzzy
msgid "HP DeskJet 995C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 995C"
#: src/main/xmli18n-tmp.h:595
msgid "HP DeskJet 1100C"
@@ -5033,9 +4631,8 @@ msgid "HP DeskJet 1120C"
msgstr "HP DeskJet 1120C"
#: src/main/xmli18n-tmp.h:597
-#, fuzzy
msgid "HP DeskJet 1125C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP DeskJet 1125C"
#: src/main/xmli18n-tmp.h:598
msgid "HP DeskJet 1200C"
@@ -5050,118 +4647,96 @@ msgid "HP DeskJet 1600C"
msgstr "HP DeskJet 1600C"
#: src/main/xmli18n-tmp.h:601
-#, fuzzy
msgid "HP DeskJet 1600CM"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600CM"
#: src/main/xmli18n-tmp.h:602
-#, fuzzy
msgid "HP DeskJet 2000"
-msgstr "HP DeskJet 1200C"
+msgstr "HP DeskJet 2000"
#: src/main/xmli18n-tmp.h:603
-#, fuzzy
msgid "HP DeskJet 2500"
-msgstr "HP DeskJet 500"
+msgstr "HP DeskJet 2500"
#: src/main/xmli18n-tmp.h:604
-#, fuzzy
msgid "HP DeskJet 2500CM"
-msgstr "HP DeskJet 500C"
+msgstr "HP DeskJet 2500CM"
#: src/main/xmli18n-tmp.h:605
-#, fuzzy
msgid "HP DeskJet 340C"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 340C"
#: src/main/xmli18n-tmp.h:606
-#, fuzzy
msgid "HP DeskJet 3810"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 3810"
#: src/main/xmli18n-tmp.h:607
-#, fuzzy
msgid "HP DeskJet 3816"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 3816"
#: src/main/xmli18n-tmp.h:608
-#, fuzzy
msgid "HP DeskJet 3820"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 3820"
#: src/main/xmli18n-tmp.h:609
-#, fuzzy
msgid "HP DeskJet 3822"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 3822"
#: src/main/xmli18n-tmp.h:610
-#, fuzzy
msgid "HP LaserJet 2"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2"
#: src/main/xmli18n-tmp.h:611
-#, fuzzy
msgid "HP LaserJet 2D"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2D"
#: src/main/xmli18n-tmp.h:612
-#, fuzzy
msgid "HP LaserJet 2P Plus"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2P Plus"
#: src/main/xmli18n-tmp.h:613
-#, fuzzy
msgid "HP LaserJet 2P"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2P"
#: src/main/xmli18n-tmp.h:614
-#, fuzzy
msgid "HP LaserJet 3"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3"
#: src/main/xmli18n-tmp.h:615
-#, fuzzy
msgid "HP LaserJet 3D"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3D"
#: src/main/xmli18n-tmp.h:616
-#, fuzzy
msgid "HP LaserJet 3P w/ PCL5"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3P w/ PCL5"
#: src/main/xmli18n-tmp.h:617
-#, fuzzy
msgid "HP LaserJet 3P w/PS"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 3P w/PS"
#: src/main/xmli18n-tmp.h:618
-#, fuzzy
msgid "HP LaserJet 4 Plus"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4 Plus"
#: src/main/xmli18n-tmp.h:619
-#, fuzzy
msgid "HP LaserJet 4"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 4"
#: src/main/xmli18n-tmp.h:620
msgid "HP LaserJet 4L"
msgstr "HP LaserJet 4L"
#: src/main/xmli18n-tmp.h:621
-#, fuzzy
msgid "HP LaserJet 4M"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4M"
#: src/main/xmli18n-tmp.h:622
-#, fuzzy
msgid "HP LaserJet 4ML"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4ML"
#: src/main/xmli18n-tmp.h:623
-#, fuzzy
msgid "HP LaserJet 4P"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4O"
#: src/main/xmli18n-tmp.h:624
msgid "HP LaserJet 4Si"
@@ -5172,540 +4747,444 @@ msgid "HP LaserJet 4V"
msgstr "HP LaserJet 4V"
#: src/main/xmli18n-tmp.h:626
-#, fuzzy
msgid "HP LaserJet 5"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5"
#: src/main/xmli18n-tmp.h:627
-#, fuzzy
msgid "HP LaserJet 5L"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 5L"
#: src/main/xmli18n-tmp.h:628
-#, fuzzy
msgid "HP LaserJet 5M"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5M"
#: src/main/xmli18n-tmp.h:629
-#, fuzzy
msgid "HP LaserJet 5MP"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5MP"
#: src/main/xmli18n-tmp.h:630
-#, fuzzy
msgid "HP LaserJet 5P"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5P"
#: src/main/xmli18n-tmp.h:631
msgid "HP LaserJet 5Si"
msgstr "HP LaserJet 5Si"
#: src/main/xmli18n-tmp.h:632
-#, fuzzy
msgid "HP LaserJet 6"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6"
#: src/main/xmli18n-tmp.h:633
-#, fuzzy
msgid "HP LaserJet 6L"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 6L"
#: src/main/xmli18n-tmp.h:634
-#, fuzzy
msgid "HP LaserJet 6MP"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6MP"
#: src/main/xmli18n-tmp.h:635
-#, fuzzy
msgid "HP LaserJet 6P"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6P"
#: src/main/xmli18n-tmp.h:636
-#, fuzzy
msgid "HP LaserJet 1010"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1010"
#: src/main/xmli18n-tmp.h:637
-#, fuzzy
msgid "HP LaserJet 1012"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1012"
#: src/main/xmli18n-tmp.h:638
-#, fuzzy
msgid "HP LaserJet 1015"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 1015"
#: src/main/xmli18n-tmp.h:639
-#, fuzzy
msgid "HP LaserJet 1100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1100"
#: src/main/xmli18n-tmp.h:640
-#, fuzzy
msgid "HP LaserJet 1100A"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 1100A"
#: src/main/xmli18n-tmp.h:641
-#, fuzzy
msgid "HP LaserJet 1150"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 1150"
#: src/main/xmli18n-tmp.h:642
-#, fuzzy
msgid "HP LaserJet 1200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1200"
#: src/main/xmli18n-tmp.h:643
-#, fuzzy
msgid "HP LaserJet 1220"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1120"
#: src/main/xmli18n-tmp.h:644
-#, fuzzy
msgid "HP LaserJet 1300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1300"
#: src/main/xmli18n-tmp.h:645
-#, fuzzy
msgid "HP LaserJet 2100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2100"
#: src/main/xmli18n-tmp.h:646
-#, fuzzy
msgid "HP LaserJet 2100M"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2100M"
#: src/main/xmli18n-tmp.h:647
-#, fuzzy
msgid "HP LaserJet 2200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2200"
#: src/main/xmli18n-tmp.h:648
-#, fuzzy
msgid "HP LaserJet 2300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2300"
#: src/main/xmli18n-tmp.h:649
-#, fuzzy
msgid "HP LaserJet 3200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3200"
#: src/main/xmli18n-tmp.h:650
-#, fuzzy
msgid "HP LaserJet 3200m"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3200m"
#: src/main/xmli18n-tmp.h:651
-#, fuzzy
msgid "HP LaserJet 3200se"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3200se"
#: src/main/xmli18n-tmp.h:652
-#, fuzzy
msgid "HP LaserJet 3300 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3300 MFP"
#: src/main/xmli18n-tmp.h:653
-#, fuzzy
msgid "HP LaserJet 3310 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3310 MFP"
#: src/main/xmli18n-tmp.h:654
-#, fuzzy
msgid "HP LaserJet 3320 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3320 MFP"
#: src/main/xmli18n-tmp.h:655
-#, fuzzy
msgid "HP LaserJet 3320N MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3320N MFP"
#: src/main/xmli18n-tmp.h:656
-#, fuzzy
msgid "HP LaserJet 3330 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3330 MFP"
#: src/main/xmli18n-tmp.h:657
-#, fuzzy
msgid "HP LaserJet 4000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4000"
#: src/main/xmli18n-tmp.h:658
-#, fuzzy
msgid "HP LaserJet 4050"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4050"
#: src/main/xmli18n-tmp.h:659
-#, fuzzy
msgid "HP LaserJet 4100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4100"
#: src/main/xmli18n-tmp.h:660
-#, fuzzy
msgid "HP LaserJet 4200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4200"
#: src/main/xmli18n-tmp.h:661
-#, fuzzy
msgid "HP LaserJet 4300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4300"
#: src/main/xmli18n-tmp.h:662
-#, fuzzy
msgid "HP LaserJet 5000"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5000"
#: src/main/xmli18n-tmp.h:663
-#, fuzzy
msgid "HP LaserJet 5100"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5100"
#: src/main/xmli18n-tmp.h:664
-#, fuzzy
msgid "HP LaserJet 8000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 8000"
#: src/main/xmli18n-tmp.h:665
-#, fuzzy
msgid "HP LaserJet 8100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 8100"
#: src/main/xmli18n-tmp.h:666
-#, fuzzy
msgid "HP LaserJet 8150"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 8150"
#: src/main/xmli18n-tmp.h:667
-#, fuzzy
msgid "HP LaserJet 9000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 9000"
#: src/main/xmli18n-tmp.h:668
msgid "HP Mopier 240"
-msgstr ""
+msgstr "HP Mopier 240"
#: src/main/xmli18n-tmp.h:669
msgid "HP Mopier 320"
-msgstr ""
+msgstr "HP Mopier 320"
#: src/main/xmli18n-tmp.h:670
-#, fuzzy
msgid "HP OfficeJet 300"
-msgstr "HP DeskJet 500"
+msgstr "HP OfficeJet 300"
#: src/main/xmli18n-tmp.h:671
-#, fuzzy
msgid "HP OfficeJet 330"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 330"
#: src/main/xmli18n-tmp.h:672
-#, fuzzy
msgid "HP OfficeJet 350"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 350"
#: src/main/xmli18n-tmp.h:673
-#, fuzzy
msgid "HP OfficeJet 500"
-msgstr "HP DeskJet 500"
+msgstr "HP OfficeJet 500"
#: src/main/xmli18n-tmp.h:674
-#, fuzzy
msgid "HP OfficeJet 520"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 520"
#: src/main/xmli18n-tmp.h:675
-#, fuzzy
msgid "HP OfficeJet 570"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 570"
#: src/main/xmli18n-tmp.h:676
-#, fuzzy
msgid "HP OfficeJet 580"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 580"
#: src/main/xmli18n-tmp.h:677
-#, fuzzy
msgid "HP OfficeJet 590"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 590"
#: src/main/xmli18n-tmp.h:678
-#, fuzzy
msgid "HP OfficeJet 600"
-msgstr "HP DeskJet 1600C"
+msgstr "HP OfficeJet 600"
#: src/main/xmli18n-tmp.h:679
-#, fuzzy
msgid "HP OfficeJet 610"
-msgstr "HP DeskJet 810C"
+msgstr "HP OfficeJet 610"
#: src/main/xmli18n-tmp.h:680
-#, fuzzy
msgid "HP OfficeJet 625"
-msgstr "HP DesignJet 250C"
+msgstr "HP OfficeJet 625"
#: src/main/xmli18n-tmp.h:681
-#, fuzzy
msgid "HP OfficeJet 630"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 630"
#: src/main/xmli18n-tmp.h:682
-#, fuzzy
msgid "HP OfficeJet 635"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 635"
#: src/main/xmli18n-tmp.h:683
-#, fuzzy
msgid "HP OfficeJet 700"
-msgstr "HP DesignJet 700"
+msgstr "HP OfficeJet 700"
#: src/main/xmli18n-tmp.h:684
-#, fuzzy
msgid "HP OfficeJet 710"
-msgstr "HP DeskJet 870C"
+msgstr "HP OfficeJet 710"
#: src/main/xmli18n-tmp.h:685
-#, fuzzy
msgid "HP OfficeJet 720"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 720"
#: src/main/xmli18n-tmp.h:686
-#, fuzzy
msgid "HP OfficeJet 725"
-msgstr "HP DesignJet 250C"
+msgstr "HP OfficeJet 725"
#: src/main/xmli18n-tmp.h:687
-#, fuzzy
msgid "HP OfficeJet 5105"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 5105"
#: src/main/xmli18n-tmp.h:688
-#, fuzzy
msgid "HP OfficeJet 5110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 5110"
#: src/main/xmli18n-tmp.h:689
-#, fuzzy
msgid "HP OfficeJet 5110xi"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 5110xi"
#: src/main/xmli18n-tmp.h:690
-#, fuzzy
msgid "HP OfficeJet 6105"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet 6105"
#: src/main/xmli18n-tmp.h:691
-#, fuzzy
msgid "HP OfficeJet 6110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 6110"
#: src/main/xmli18n-tmp.h:692
-#, fuzzy
msgid "HP OfficeJet 7110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 7110"
#: src/main/xmli18n-tmp.h:693
-#, fuzzy
msgid "HP OfficeJet 7130"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 7130"
#: src/main/xmli18n-tmp.h:694
-#, fuzzy
msgid "HP OfficeJet 7140"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet 7140"
#: src/main/xmli18n-tmp.h:695
-#, fuzzy
msgid "HP OfficeJet D125"
-msgstr "HP DeskJet 812C"
+msgstr "HP OfficeJet D125"
#: src/main/xmli18n-tmp.h:696
msgid "HP OfficeJet D135"
-msgstr ""
+msgstr "HP OfficeJet D135"
#: src/main/xmli18n-tmp.h:697
-#, fuzzy
msgid "HP OfficeJet D145"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet D145"
#: src/main/xmli18n-tmp.h:698
-#, fuzzy
msgid "HP OfficeJet D155"
-msgstr "HP DeskJet 550C"
+msgstr "HP OfficeJet D155"
#: src/main/xmli18n-tmp.h:699
-#, fuzzy
msgid "HP OfficeJet G55"
-msgstr "HP DeskJet 855C"
+msgstr "HP OfficeJet G55"
#: src/main/xmli18n-tmp.h:700
-#, fuzzy
msgid "HP OfficeJet G85"
-msgstr "HP DeskJet 895C"
+msgstr "HP OfficeJet G85"
#: src/main/xmli18n-tmp.h:701
-#, fuzzy
msgid "HP OfficeJet G95"
-msgstr "HP DeskJet 895C"
+msgstr "HP OfficeJet G95"
#: src/main/xmli18n-tmp.h:702
-#, fuzzy
msgid "HP OfficeJet K60"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet K60"
#: src/main/xmli18n-tmp.h:703
-#, fuzzy
msgid "HP OfficeJet K60xi"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet K60xi"
#: src/main/xmli18n-tmp.h:704
-#, fuzzy
msgid "HP OfficeJet K80"
-msgstr "HP DeskJet 890C"
+msgstr "HP OfficeJet K80"
#: src/main/xmli18n-tmp.h:705
-#, fuzzy
msgid "HP OfficeJet K80xi"
-msgstr "HP DeskJet 810C"
+msgstr "HP OfficeJet K80xi"
#: src/main/xmli18n-tmp.h:706
-#, fuzzy
msgid "HP OfficeJet LX"
-msgstr "HP LaserJet 4L"
+msgstr "HP OfficeJet LX"
#: src/main/xmli18n-tmp.h:707
-#, fuzzy
msgid "HP OfficeJet Pro 1150C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet Pro 1150C"
#: src/main/xmli18n-tmp.h:708
-#, fuzzy
msgid "HP OfficeJet Pro 1170C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet Pro 1170C"
#: src/main/xmli18n-tmp.h:709
msgid "HP OfficeJet Pro 1175C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1175C"
#: src/main/xmli18n-tmp.h:710
-#, fuzzy
msgid "HP OfficeJet R40"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet R40"
#: src/main/xmli18n-tmp.h:711
-#, fuzzy
msgid "HP OfficeJet R45"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet R45"
#: src/main/xmli18n-tmp.h:712
-#, fuzzy
msgid "HP OfficeJet R60"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet R60"
#: src/main/xmli18n-tmp.h:713
-#, fuzzy
msgid "HP OfficeJet R65"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet R65"
#: src/main/xmli18n-tmp.h:714
-#, fuzzy
msgid "HP OfficeJet R80"
-msgstr "HP DeskJet 890C"
+msgstr "HP OfficeJet R80"
#: src/main/xmli18n-tmp.h:715
-#, fuzzy
msgid "HP OfficeJet T45"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet T45"
#: src/main/xmli18n-tmp.h:716
-#, fuzzy
msgid "HP OfficeJet T65"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet T65"
#: src/main/xmli18n-tmp.h:717
-#, fuzzy
msgid "HP OfficeJet V40"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet V40"
#: src/main/xmli18n-tmp.h:718
-#, fuzzy
msgid "HP OfficeJet V40xi"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet V40xi"
#: src/main/xmli18n-tmp.h:719
msgid "HP OfficeJet"
-msgstr ""
+msgstr "HP OfficeJet"
#: src/main/xmli18n-tmp.h:720
msgid "HP PSC 370"
-msgstr ""
+msgstr "HP PSC 370"
#: src/main/xmli18n-tmp.h:721
msgid "HP PSC 380"
-msgstr ""
+msgstr "HP PSC 380"
#: src/main/xmli18n-tmp.h:722
msgid "HP PSC 500"
-msgstr ""
+msgstr "HP PSC 500"
#: src/main/xmli18n-tmp.h:723
msgid "HP PSC 750"
-msgstr ""
+msgstr "HP PSC 750"
#: src/main/xmli18n-tmp.h:724
msgid "HP PSC 950"
-msgstr ""
+msgstr "HP PSC 950"
#: src/main/xmli18n-tmp.h:725
msgid "HP PSC 950xi"
-msgstr ""
+msgstr "HP PSC 950xi"
#: src/main/xmli18n-tmp.h:726
-#, fuzzy
msgid "HP PSC 2110"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PSC 2110"
#: src/main/xmli18n-tmp.h:727
msgid "HP PSC 2150"
-msgstr ""
+msgstr "HP PSC 2150"
#: src/main/xmli18n-tmp.h:728
msgid "HP PSC 2210"
-msgstr ""
+msgstr "HP PSC 2210"
#: src/main/xmli18n-tmp.h:729
-#, fuzzy
msgid "HP PhotoSmart 7150"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7150"
#: src/main/xmli18n-tmp.h:730
-#, fuzzy
msgid "HP PhotoSmart 7345"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7345"
#: src/main/xmli18n-tmp.h:731
-#, fuzzy
msgid "HP PhotoSmart 7350"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7350"
#: src/main/xmli18n-tmp.h:732
-#, fuzzy
msgid "HP PhotoSmart 7550"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7550"
#: src/main/xmli18n-tmp.h:733
-#, fuzzy
msgid "HP PhotoSmart P100"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P100"
#: src/main/xmli18n-tmp.h:734
-#, fuzzy
msgid "HP PhotoSmart P130"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P130"
#: src/main/xmli18n-tmp.h:735
-#, fuzzy
msgid "HP PhotoSmart P230"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P230"
#: src/main/xmli18n-tmp.h:736
msgid "HP PhotoSmart P1000"
@@ -5716,512 +5195,504 @@ msgid "HP PhotoSmart P1100"
msgstr "HP PhotoSmart P1100"
#: src/main/xmli18n-tmp.h:738
-#, fuzzy
msgid "HP PhotoSmart P1115"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1115"
#: src/main/xmli18n-tmp.h:739
-#, fuzzy
msgid "HP PhotoSmart P1215"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1215"
#: src/main/xmli18n-tmp.h:740
-#, fuzzy
msgid "HP PhotoSmart P1218"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1218"
#: src/main/xmli18n-tmp.h:741
-#, fuzzy
msgid "HP PhotoSmart P1315"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1315"
#: src/main/xmli18n-tmp.h:742
-#, fuzzy
msgid "HP e-printer e20"
-msgstr "HP DesignJet 230"
+msgstr "HP e-printer e20"
#: src/main/xmli18n-tmp.h:743
msgid "IBM 4019"
-msgstr ""
+msgstr "IBM 4019"
#: src/main/xmli18n-tmp.h:744
msgid "IBM 4029 030 LaserPrinter 10"
-msgstr ""
+msgstr "IBM 4029 030 LaserPrinter 10"
#: src/main/xmli18n-tmp.h:745
msgid "IBM 4312"
-msgstr ""
+msgstr "IBM 4312"
#: src/main/xmli18n-tmp.h:746
msgid "IBM Infoprint 12"
-msgstr ""
+msgstr "IBM Infoprint 12"
#: src/main/xmli18n-tmp.h:747
msgid "IBM Page Printer 3112"
-msgstr ""
+msgstr "IBM Page Printer 3112"
#: src/main/xmli18n-tmp.h:748
msgid "Infotec 4651 MF"
-msgstr ""
+msgstr "Infotec 4651 MF"
#: src/main/xmli18n-tmp.h:749
msgid "Kyocera F-1010"
-msgstr ""
+msgstr "Kyocera F-1010"
#: src/main/xmli18n-tmp.h:750
msgid "Kyocera FS-600 - KPDL-2"
-msgstr ""
+msgstr "Kyocera FS-600 - KPDL-2"
#: src/main/xmli18n-tmp.h:751
msgid "Kyocera FS-600"
-msgstr ""
+msgstr "Kyocera FS-600"
#: src/main/xmli18n-tmp.h:752
msgid "Kyocera FS-680"
-msgstr ""
+msgstr "Kyocera FS-680"
#: src/main/xmli18n-tmp.h:753
msgid "Kyocera FS-800"
-msgstr ""
+msgstr "Kyocera FS-800"
#: src/main/xmli18n-tmp.h:754
msgid "Kyocera FS-1000"
-msgstr ""
+msgstr "Kyocera FS-1000"
#: src/main/xmli18n-tmp.h:755
msgid "Kyocera FS-1000+"
-msgstr ""
+msgstr "Kyocera FS-1000+"
#: src/main/xmli18n-tmp.h:756
msgid "Kyocera FS-1010"
-msgstr ""
+msgstr "Kyocera FS-1010"
#: src/main/xmli18n-tmp.h:757
msgid "Kyocera FS-1050"
-msgstr ""
+msgstr "Kyocera FS-1050"
#: src/main/xmli18n-tmp.h:758
msgid "Kyocera FS-1200"
-msgstr ""
+msgstr "Kyocera FS-1200"
#: src/main/xmli18n-tmp.h:759
msgid "Kyocera FS-1600"
-msgstr ""
+msgstr "Kyocera FS-1600"
#: src/main/xmli18n-tmp.h:760
msgid "Kyocera FS-1600+"
-msgstr ""
+msgstr "Kyocera FS-1600+"
#: src/main/xmli18n-tmp.h:761
msgid "Kyocera FS-1700"
-msgstr ""
+msgstr "Kyocera FS-1700"
#: src/main/xmli18n-tmp.h:762
msgid "Kyocera FS-1700+"
-msgstr ""
+msgstr "Kyocera FS-1700+"
#: src/main/xmli18n-tmp.h:763
msgid "Kyocera FS-1750"
-msgstr ""
+msgstr "Kyocera FS-1750"
#: src/main/xmli18n-tmp.h:764
msgid "Kyocera FS-1800"
-msgstr ""
+msgstr "Kyocera FS-1800"
#: src/main/xmli18n-tmp.h:765
msgid "Kyocera FS-1800+"
-msgstr ""
+msgstr "Kyocera FS-1800+"
#: src/main/xmli18n-tmp.h:766
msgid "Kyocera FS-1900"
-msgstr ""
+msgstr "Kyocera FS-1900"
#: src/main/xmli18n-tmp.h:767
msgid "Kyocera FS-3500"
-msgstr ""
+msgstr "Kyocera FS-3500"
#: src/main/xmli18n-tmp.h:768
msgid "Kyocera FS-3600"
-msgstr ""
+msgstr "Kyocera FS-3600"
#: src/main/xmli18n-tmp.h:769
msgid "Kyocera FS-3600+"
-msgstr ""
+msgstr "Kyocera FS-3600+"
#: src/main/xmli18n-tmp.h:770
msgid "Kyocera FS-3700"
-msgstr ""
+msgstr "Kyocera FS-3700"
#: src/main/xmli18n-tmp.h:771
msgid "Kyocera FS-3700+"
-msgstr ""
+msgstr "Kyocera FS-3700+"
#: src/main/xmli18n-tmp.h:772
msgid "Kyocera FS-3750"
-msgstr ""
+msgstr "Kyocera FS-3750"
#: src/main/xmli18n-tmp.h:773
msgid "Kyocera FS-3800"
-msgstr ""
+msgstr "Kyocera FS-3800"
#: src/main/xmli18n-tmp.h:774
msgid "Kyocera FS-5800C"
-msgstr ""
+msgstr "Kyocera FS-5800C"
#: src/main/xmli18n-tmp.h:775
msgid "Kyocera FS-5900C"
-msgstr ""
+msgstr "Kyocera FS-5900C"
#: src/main/xmli18n-tmp.h:776
msgid "Kyocera FS-6500"
-msgstr ""
+msgstr "Kyocera FS-6500"
#: src/main/xmli18n-tmp.h:777
msgid "Kyocera FS-6500+"
-msgstr ""
+msgstr "Kyocera FS-6500+"
#: src/main/xmli18n-tmp.h:778
msgid "Kyocera FS-6700"
-msgstr ""
+msgstr "Kyocera FS-6700"
#: src/main/xmli18n-tmp.h:779
msgid "Kyocera FS-7000"
-msgstr ""
+msgstr "Kyocera FS-7000"
#: src/main/xmli18n-tmp.h:780
msgid "Kyocera FS-7000+"
-msgstr ""
+msgstr "Kyocera FS-7000+"
#: src/main/xmli18n-tmp.h:781
msgid "Kyocera FS-8000C"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
#: src/main/xmli18n-tmp.h:782
msgid "Kyocera FS-9000"
-msgstr ""
+msgstr "Kyocera FS-9000"
#: src/main/xmli18n-tmp.h:783
msgid "Kyocera FS-9100DN"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
#: src/main/xmli18n-tmp.h:784
msgid "Kyocera FS-9500DN"
-msgstr ""
+msgstr "Kyocera FS-9500DN"
#: src/main/xmli18n-tmp.h:785
msgid "Kyocera KM-1530"
-msgstr ""
+msgstr "Kyocera KM-1530"
#: src/main/xmli18n-tmp.h:786
msgid "Kyocera KM-1810"
-msgstr ""
+msgstr "Kyocera KM-1810"
#: src/main/xmli18n-tmp.h:787
msgid "Kyocera KM-2030"
-msgstr ""
+msgstr "Kyocera KM-2030"
#: src/main/xmli18n-tmp.h:788
msgid "Kyocera KM-2530"
-msgstr ""
+msgstr "Kyocera KM-2530"
#: src/main/xmli18n-tmp.h:789
msgid "Kyocera KM-3530"
-msgstr ""
+msgstr "Kyocera KM-3530"
#: src/main/xmli18n-tmp.h:790
msgid "Kyocera KM-4230"
-msgstr ""
+msgstr "Kyocera KM-4230"
#: src/main/xmli18n-tmp.h:791
msgid "Kyocera KM-4530"
-msgstr ""
+msgstr "Kyocera KM-4530"
#: src/main/xmli18n-tmp.h:792
msgid "Kyocera KM-5230"
-msgstr ""
+msgstr "Kyocera KM-5230"
#: src/main/xmli18n-tmp.h:793
msgid "Kyocera KM-5530"
-msgstr ""
+msgstr "Kyocera KM-5530"
#: src/main/xmli18n-tmp.h:794
msgid "Kyocera KM-6230"
-msgstr ""
+msgstr "Kyocera KM-6230"
#: src/main/xmli18n-tmp.h:795
msgid "Lexmark 4076"
msgstr "Lexmark 4076"
#: src/main/xmli18n-tmp.h:796
-#, fuzzy
msgid "Lexmark Optra E"
-msgstr "Lexmark Z42"
+msgstr "Lexmark Optra E"
#: src/main/xmli18n-tmp.h:797
msgid "Lexmark Optra E+"
-msgstr ""
+msgstr "Lexmark Optra E+"
#: src/main/xmli18n-tmp.h:798
msgid "Lexmark Valuewriter 300"
-msgstr ""
+msgstr "Lexmark Valuewriter 300"
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
-msgstr ""
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
-msgstr ""
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
-msgstr ""
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
-msgstr ""
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
-msgstr ""
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
-msgstr ""
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
-msgstr ""
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
-msgstr ""
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
-msgstr ""
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
-msgstr ""
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
-msgstr ""
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
-msgstr ""
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
#: src/main/xmli18n-tmp.h:811
msgid "Okidata OL400"
-msgstr ""
+msgstr "Okidata OL400"
#: src/main/xmli18n-tmp.h:812
msgid "Okidata OL400e"
-msgstr ""
+msgstr "Okidata OL400e"
#: src/main/xmli18n-tmp.h:813
msgid "Okidata OL400ex"
-msgstr ""
+msgstr "Okidata OL400ex"
#: src/main/xmli18n-tmp.h:814
msgid "Okidata OL410e"
-msgstr ""
+msgstr "Okidata OL410e"
#: src/main/xmli18n-tmp.h:815
msgid "Okidata OL600e"
-msgstr ""
+msgstr "Okidata OL600e"
#: src/main/xmli18n-tmp.h:816
msgid "Okidata OL610e/S"
-msgstr ""
+msgstr "Okidata OL610e/S"
#: src/main/xmli18n-tmp.h:817
msgid "Okidata OL800"
-msgstr ""
+msgstr "Okidata OL800"
#: src/main/xmli18n-tmp.h:818
msgid "Okidata OL810ex"
-msgstr ""
+msgstr "Okidata OL810ex"
#: src/main/xmli18n-tmp.h:819
msgid "Okidata Okipage 6e"
-msgstr ""
+msgstr "Okidata Okipage 6e"
#: src/main/xmli18n-tmp.h:820
msgid "Okidata Okipage 6ex"
-msgstr ""
+msgstr "Okidata Okipage 6ex"
#: src/main/xmli18n-tmp.h:821
msgid "Okidata Okipage 8p"
-msgstr ""
+msgstr "Okidata Okipage 8p"
#: src/main/xmli18n-tmp.h:822
msgid "Okidata Okipage 10e"
-msgstr ""
+msgstr "Okidata Okipage 10e"
#: src/main/xmli18n-tmp.h:823
msgid "Okidata Okipage 10ex"
-msgstr ""
+msgstr "Okidata Okipage 10ex"
#: src/main/xmli18n-tmp.h:824
msgid "Okidata Okipage 14ex"
-msgstr ""
+msgstr "Okidata Okipage 14ex"
#: src/main/xmli18n-tmp.h:825
msgid "Okidata Super 6e"
-msgstr ""
+msgstr "Okidata Super 6e"
#: src/main/xmli18n-tmp.h:826
msgid "Olivetti JP350S"
-msgstr ""
+msgstr "Olivetti JP350S"
#: src/main/xmli18n-tmp.h:827
msgid "Olivetti PG 306"
-msgstr ""
+msgstr "Olivetti PG 306"
#: src/main/xmli18n-tmp.h:828
msgid "PCPI 1030"
-msgstr ""
+msgstr "PCPI 1030"
#: src/main/xmli18n-tmp.h:829
msgid "Panasonic KX-P4410"
-msgstr ""
+msgstr "Panasonic KX-P4410"
#: src/main/xmli18n-tmp.h:830
msgid "Panasonic KX-P4450"
-msgstr ""
+msgstr "Panasonic KX-P4450"
#: src/main/xmli18n-tmp.h:831
msgid "Panasonic KX-P6150"
-msgstr ""
+msgstr "Panasonic KX-P6150"
#: src/main/xmli18n-tmp.h:832
msgid "Panasonic KX-P6500"
-msgstr ""
+msgstr "Panasonic KX-P6500"
#: src/main/xmli18n-tmp.h:833
msgid "Raven LP-410"
-msgstr ""
+msgstr "Raven LP-410"
#: src/main/xmli18n-tmp.h:834
msgid "Ricoh Aficio 220"
-msgstr ""
+msgstr "Ricoh Aficio 220"
#: src/main/xmli18n-tmp.h:835
msgid "Ricoh Aficio 401"
-msgstr ""
+msgstr "Ricoh Aficio 401"
#: src/main/xmli18n-tmp.h:836
msgid "Ricoh Aficio 700"
-msgstr ""
+msgstr "Ricoh Aficio 700"
#: src/main/xmli18n-tmp.h:837
msgid "Samsung ML-85"
-msgstr ""
+msgstr "Samsung ML-85"
#: src/main/xmli18n-tmp.h:838
msgid "Samsung ML-4600"
-msgstr ""
+msgstr "Samsung ML-4600"
#: src/main/xmli18n-tmp.h:839
msgid "Samsung ML-5000a"
-msgstr ""
+msgstr "Samsung ML-5000a"
#: src/main/xmli18n-tmp.h:840
msgid "Samsung ML-6000"
-msgstr ""
+msgstr "\"Samsung ML-6000"
#: src/main/xmli18n-tmp.h:841
msgid "Samsung ML-6100"
-msgstr ""
+msgstr "Samsung ML-6100"
#: src/main/xmli18n-tmp.h:842
msgid "Samsung ML-7000"
-msgstr ""
+msgstr "Samsung ML-7000"
#: src/main/xmli18n-tmp.h:843
msgid "Samsung ML-7000N"
-msgstr ""
+msgstr "Samsung ML-7000N"
#: src/main/xmli18n-tmp.h:844
msgid "Samsung ML-7000P"
-msgstr ""
+msgstr "Samsung ML-7000P"
#: src/main/xmli18n-tmp.h:845
msgid "Samsung ML-7050"
-msgstr ""
+msgstr "Samsung ML-7050"
#: src/main/xmli18n-tmp.h:846
msgid "Samsung QL-5100A"
-msgstr ""
+msgstr "Samsung QL-5100A"
#: src/main/xmli18n-tmp.h:847
msgid "Samsung QL-6050"
-msgstr ""
+msgstr "Samsung QL-6050"
#: src/main/xmli18n-tmp.h:848
msgid "Seiko SpeedJET 200"
-msgstr ""
+msgstr "Seiko SpeedJET 200"
#: src/main/xmli18n-tmp.h:849
msgid "Sharp AR-161"
-msgstr ""
+msgstr "Sharp AR-161"
#: src/main/xmli18n-tmp.h:850
-#, fuzzy
msgid "Sony IJP-V100"
-msgstr "Sony UP-DP10"
+msgstr "Sony IJP-V100"
#: src/main/xmli18n-tmp.h:851
msgid "Star LS-04"
-msgstr ""
+msgstr "Star LS-04"
#: src/main/xmli18n-tmp.h:852
-#, fuzzy
msgid "Star LaserPrinter 8"
-msgstr "Configuration de l'imprimante"
+msgstr "Star LaserPrinter 8"
#: src/main/xmli18n-tmp.h:853
msgid "Tally MT908"
-msgstr ""
+msgstr "Tally MT908"
#: src/main/xmli18n-tmp.h:854
msgid "Xerox Able 1406"
-msgstr ""
+msgstr "Xerox Able 1406"
#: src/main/xmli18n-tmp.h:855
msgid "Xerox DocuPrint 4508"
-msgstr ""
+msgstr "Xerox DocuPrint 4508"
#: src/main/xmli18n-tmp.h:856
msgid "Xerox DocuPrint C20"
-msgstr ""
+msgstr "Xerox DocuPrint C20"
#: src/main/xmli18n-tmp.h:857
msgid "Xerox DocuPrint N4512"
-msgstr ""
+msgstr "Xerox DocuPrint N4512"
#: src/main/xmli18n-tmp.h:858
msgid "Xerox DocuPrint N4512PS"
-msgstr ""
+msgstr "Xerox DocuPrint N4512PS"
#: src/main/xmli18n-tmp.h:859
msgid "Xerox DocuPrint P12"
-msgstr ""
+msgstr "Xerox DocuPrint P12"
#: src/main/xmli18n-tmp.h:860
msgid "Xerox DocuPrint P1202"
-msgstr ""
+msgstr "Xerox DocuPrint P1202"
#: src/main/xmli18n-tmp.h:861
msgid "Xerox DocuPrint P8e"
-msgstr ""
+msgstr "Xerox DocuPrint P8e"
#: src/main/xmli18n-tmp.h:862
msgid "Xerox Document Centre 400"
-msgstr ""
+msgstr "Xerox Document Centre 400"
#: src/main/xmli18n-tmp.h:863
msgid "Lexmark Z42"
@@ -6240,104 +5711,84 @@ msgid "Lexmark Z53"
msgstr "Lexmark Z53"
#: src/main/xmli18n-tmp.h:867
-#, fuzzy
msgid "Olympus P-10"
-msgstr "Olympus P10"
+msgstr "Olympus P-10"
#: src/main/xmli18n-tmp.h:868
-#, fuzzy
msgid "Olympus P-11"
-msgstr "Olympus P10"
+msgstr "Olympus P-11"
#: src/main/xmli18n-tmp.h:869
-#, fuzzy
msgid "Olympus P-200"
-msgstr "Olympus P200"
+msgstr "Olympus P-200"
#: src/main/xmli18n-tmp.h:870
-#, fuzzy
msgid "Olympus P-300"
-msgstr "Olympus P300"
+msgstr "Olympus P-300"
#: src/main/xmli18n-tmp.h:871
-#, fuzzy
msgid "Olympus P-300E"
-msgstr "Olympus P300"
+msgstr "Olympus P-300E"
#: src/main/xmli18n-tmp.h:872
-#, fuzzy
msgid "Olympus P-300U"
-msgstr "Olympus P300"
+msgstr "Olympus P-3000"
#: src/main/xmli18n-tmp.h:873
-#, fuzzy
msgid "Olympus P-330E"
-msgstr "Olympus P300"
+msgstr "Olympus P-330E"
#: src/main/xmli18n-tmp.h:874
-#, fuzzy
msgid "Olympus P-330NE"
-msgstr "Olympus P300"
+msgstr "Olympus P-330NE"
#: src/main/xmli18n-tmp.h:875
-#, fuzzy
msgid "Olympus P-400"
-msgstr "Olympus P400"
+msgstr "Olympus P-400"
#: src/main/xmli18n-tmp.h:876
-#, fuzzy
msgid "Olympus P-440"
-msgstr "Olympus P440"
+msgstr "Olympus P-440"
#: src/main/xmli18n-tmp.h:877
-#, fuzzy
msgid "Canon CP-100"
-msgstr "Canon CP100"
+msgstr "Canon CP-100"
#: src/main/xmli18n-tmp.h:878
-#, fuzzy
msgid "Canon CP-200"
-msgstr "Canon CP220"
+msgstr "Canon CP-200"
#: src/main/xmli18n-tmp.h:879
-#, fuzzy
msgid "Canon CP-220"
-msgstr "Canon CP220"
+msgstr "Canon CP-220"
#: src/main/xmli18n-tmp.h:880
-#, fuzzy
msgid "Canon CP-300"
-msgstr "Canon CP100"
+msgstr "Canon CP-300"
#: src/main/xmli18n-tmp.h:881
-#, fuzzy
msgid "Canon CP-330"
-msgstr "Canon CP100"
+msgstr "Canon CP-330"
#: src/main/xmli18n-tmp.h:882
-#, fuzzy
msgid "Canon SELPHY-CP-400"
-msgstr "Canon S400"
+msgstr "Canon SELPHY-CP-400"
#: src/main/xmli18n-tmp.h:883
-#, fuzzy
msgid "Canon SELPHY-CP-500"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-500"
#: src/main/xmli18n-tmp.h:884
-#, fuzzy
msgid "Canon SELPHY-CP-510"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-510"
#: src/main/xmli18n-tmp.h:885
-#, fuzzy
msgid "Canon SELPHY-CP-600"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-600"
#: src/main/xmli18n-tmp.h:886
-#, fuzzy
msgid "Canon SELPHY-CP-710"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-710"
#: src/main/xmli18n-tmp.h:887
msgid "Sony UP-DP10"
@@ -6348,22 +5799,20 @@ msgid "Sony UP-DR150"
msgstr "Sony UP-DR150"
#: src/main/xmli18n-tmp.h:889
-#, fuzzy
msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix CX-400"
+msgstr "Fujifilm Printpix-CX-400"
#: src/main/xmli18n-tmp.h:890
-#, fuzzy
msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix CX-550"
+msgstr "Fujifilm Printpix-CX-550"
#: src/main/xmli18n-tmp.h:891
msgid "RAW DATA 16 bit"
-msgstr ""
+msgstr "Données brutes (raw) 16 bits"
#: src/main/xmli18n-tmp.h:892
msgid "RAW DATA 8 bit"
-msgstr ""
+msgstr "Données brutes (raw) 8 bits"
#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
msgid "Inch"
@@ -6395,7 +5844,7 @@ msgstr "mm"
#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
msgid "Set the base unit of measurement to millimetres"
-msgstr "Définir l'unité de base de mesure en millimètres"
+msgstr "Défini l'unité de base de mesure en millimètres"
#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
msgid "Pica"
@@ -6403,7 +5852,7 @@ msgstr "Pica"
#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Défini l'unité de base de mesure en picas (1/12\")"
+msgstr "Défini l'unité de base de mesure en pica (1/72\")"
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color output"
@@ -6415,19 +5864,19 @@ msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
msgid "Standard Command"
-msgstr "Commande Standard"
+msgstr "Commande standard"
#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
msgid "Use standard print command"
-msgstr ""
+msgstr "Utiliser la commande d'impression standard"
#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
msgid "Custom Command"
-msgstr "Commande personalisée:"
+msgstr "Commande personnalisée"
#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
msgid "Use custom print command"
-msgstr ""
+msgstr "Utiliser une commande personnalisée"
#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
@@ -6441,7 +5890,7 @@ msgstr "Imprimer dans un fichier"
#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
msgid "Edit Curve..."
-msgstr "Editer Courbe..."
+msgstr "Editer la courbe..."
#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
msgid "Set Default"
@@ -6449,7 +5898,7 @@ msgstr "Valeurs par défaut"
#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
msgid "Restore Previous"
-msgstr ""
+msgstr "Valeurs précédentes"
#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
@@ -6521,7 +5970,7 @@ msgstr ""
"Maintenir la touche Maj enfoncée en Cliquant et Glissant contraint l'image à "
"se déplacer horizontalement ou verticalement.\n"
"Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
-"retournera à sa position originale."
+"retournera à sa position de départ."
#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
msgid "Paper Size"
@@ -6529,13 +5978,13 @@ msgstr "Taille du papier"
#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
msgid "Show All Paper Sizes"
-msgstr "Afficher toutes les tailles de papier"
+msgstr "Afficher tout les formats"
#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
msgid "Dimensions:"
msgstr "Dimensions :"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Largeur :"
@@ -6544,7 +5993,7 @@ msgstr "Largeur :"
msgid "Width of the paper that you wish to print to"
msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Hauteur :"
@@ -6555,15 +6004,15 @@ msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
msgid "Automatic Paper Size"
-msgstr "Taille de papier automatique"
+msgstr "Taille papier automatique"
#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
msgid "Number of Copies"
-msgstr "Nombre de copies"
+msgstr "Nombre d'exemplaires"
#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Choisissez le nombre de copies à imprimer; Une valeur entre 1 et 100"
+msgstr "Choisir le nombre d'exemplaires à imprimer, entre 1 et 100"
#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
msgid "Image Position"
@@ -6583,19 +6032,19 @@ msgstr "Paysage"
#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
msgid "Upside down"
-msgstr "Retourner"
+msgstr "Retourné (haut/bas)"
#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
msgid "Seascape"
-msgstr "Panoramique"
+msgstr "Paysage retourné (haut/bas)"
#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
msgid ""
"Select the orientation: portrait, landscape, upside down, or seascape "
"(upside down landscape)"
msgstr ""
-"Sélectionnez l'orientation : portrait, paysage, tête-bèche, ou tête-bèche "
-"paysage"
+"Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné "
+"(retourné haut/bas)"
#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
msgid "Orientation:"
@@ -6603,7 +6052,7 @@ msgstr "Orientation :"
#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
msgid "Left:"
-msgstr "Gauche :"
+msgstr "Gauche:"
#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
msgid "Distance from the left of the paper to the image"
@@ -6612,7 +6061,7 @@ msgstr "Distance entre le bord gauche du papier et l'image"
#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
msgid "Right:"
-msgstr "Droite :"
+msgstr "Droite:"
#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
msgid "Distance from the left of the paper to the right of the image"
@@ -6624,7 +6073,7 @@ msgstr "Distance entre le bord droit du papier et l'image"
#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
msgid "Top:"
-msgstr "Dessus :"
+msgstr "Haut:"
#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
msgid "Distance from the top of the paper to the image"
@@ -6646,7 +6095,7 @@ msgstr "Distance entre le bord inférieur du papier et l'image"
#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
msgid "Center:"
-msgstr "Centrer :"
+msgstr "Centrer:"
#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
msgid "Horizontal"
@@ -6678,11 +6127,11 @@ msgstr "Configuration de l'imprimante"
#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
msgid "Printer Make:"
-msgstr "Fabricant de l'imprimante :"
+msgstr "Marque de l'imprimante :"
#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
msgid "Select the make of your printer"
-msgstr "Sélectionnez le fabricant de votre imprimante"
+msgstr "Sélectionnez la marque de votre imprimante"
#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
@@ -6695,11 +6144,11 @@ msgstr "Sélectionnez le modèle de votre imprimante"
#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
msgid "PPD File:"
-msgstr "Fichier PPD :"
+msgstr "Fichier PPD:"
#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
msgid "Enter the correct PPD filename for your printer"
-msgstr "Entrez le nom de fichier PPD correct pour votre imprimante"
+msgstr "Entrez le nom de fichier PPD pour votre imprimante"
#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
@@ -6711,33 +6160,32 @@ msgid "Choose the correct PPD filename for your printer"
msgstr "Choisissez le fichier PPD correct pour votre imprimante"
#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
-#, fuzzy
msgid ""
"Select the name of the output queue (not the type, or model, of printer) "
"that you wish to print to"
msgstr ""
-"Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
-"voulez utiliser pour l'impression"
+"Sélectionnez le nom de la file d'attente (pas le type ni le modèle "
+"d'imprimante) que vous voulez utiliser pour l'impression"
#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
msgid "Printer Queue:"
-msgstr "File d'impression"
+msgstr "File d'attente:"
#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
msgid "Enter the correct command to print to your printer. "
-msgstr "Entrez la commande correct pour imprimer vers votre imprimante."
+msgstr "Entrez la commande pour imprimer sur votre imprimante"
#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
msgid "Enter the file to print to. "
-msgstr "Entrer le nom du fichier vers lequel imprimer"
+msgstr "Entrez le nom du fichier."
#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
msgid "File to print to"
-msgstr "Fichier à imprimer vers"
+msgstr "fichier d'impression"
#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
msgid "Print To File"
-msgstr "Imprimer dans un fichier"
+msgstr "Imprimer dans un fichier ?"
#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
msgid "Define New Printer"
@@ -6820,11 +6268,11 @@ msgstr ""
"Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
"voulez utiliser pour l'impression"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Configurer l'imprimante..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6832,11 +6280,11 @@ msgstr ""
"Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
"pour l'impression sur cette imprimante"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Nouvelle imprimante..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6844,23 +6292,23 @@ msgstr ""
"Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un "
"ensemble de réglage que vous souhaitez réutiliser plus tard."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
msgstr "Taille de l'image"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
-msgstr "Échelle :"
+msgstr "Échelle:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Régler l'échelle (taille) de l'image"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
-msgstr "Facteur d'échelle"
+msgstr "Mise à l'échelle en "
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6868,106 +6316,105 @@ msgstr ""
"Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page "
"ou en nombre de points par pouces"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Pourcentage"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Dimensionne l'impression par rapport à la taille de la page"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "points par pouce"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Dimensionne l'impression en nombre de points par pouce"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Défini la largeur de l'impression"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Défini la hauteur de l'impression"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
msgstr ""
-"Utiliser la taille\n"
-"d'origine de l'image"
+"Utiliser la taille \n"
+"de l'image originale"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Utiliser la taille de l'image comme taille d'impression"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
-msgstr "Ajustez les couleurs d'impression"
+msgstr "Ajustement des couleurs d'impression"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Valeurs par défaut"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Fermer"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Aperçu de l'image"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
-msgstr "Visualiser Canaux de sortie:"
+msgstr "Visualisation canaux de sortie"
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr "Sortie"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
-msgstr "Type de sortie :"
+msgstr "Type de sortie:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Sélectionnez le type de sortie désiré"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
-msgstr "Ajuster la sortie..."
+msgstr "Réglages fins..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
"algorithme de tramage"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
-msgstr "Unités: "
+msgstr "Unités de taille:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
-#, fuzzy
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
-msgstr "> "
+msgstr " "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
-msgstr "Unités :"
+msgstr "Unités:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Sélectionne l'unité de base de mesure pour l'impression"
#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
msgid "System V lp"
-msgstr ""
+msgstr "System V lp"
#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
msgid "CUPS"
@@ -6975,23 +6422,23 @@ msgstr "CUPS"
#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
msgid "Berkeley lpd (/etc/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/etc/lpc)"
#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/bsd/lpc)"
#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr ""
+msgstr "Berkeley lpd (/usr/etc/lpc"
#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/libexec/lpc)"
#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/sbin/lpc)"
#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
msgid "Printer"
@@ -6999,7 +6446,7 @@ msgstr "Imprimante"
#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
msgid "(Default Printer)"
-msgstr "(Imprimante par défaut)"
+msgstr "(imprimante par défaut)"
#: src/gutenprintui2/curve.c:130
msgid "Curve type"
@@ -7007,125 +6454,117 @@ msgstr "Type de courbe"
#: src/gutenprintui2/curve.c:131
msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr ""
-"Cette courbe est-elle linéaire, interpolée par splines, ou à main levée"
+msgstr "Courbe linéaire, interpolée ou libre"
#: src/gutenprintui2/curve.c:139
msgid "Minimum X"
-msgstr "X Minimum"
+msgstr "Minimum X"
#: src/gutenprintui2/curve.c:140
msgid "Minimum possible value for X"
-msgstr "Valeur Minimum possible pour X"
+msgstr "Valeur minimum possible pour X"
#: src/gutenprintui2/curve.c:149
msgid "Maximum X"
-msgstr "X Maximum"
+msgstr "Maximum X"
#: src/gutenprintui2/curve.c:150
msgid "Maximum possible X value"
-msgstr "Valeur Maximum possible pour X"
+msgstr "Valeur maximum possible pour X"
#: src/gutenprintui2/curve.c:159
msgid "Minimum Y"
-msgstr "Y Minimum"
+msgstr "Minimum Y"
#: src/gutenprintui2/curve.c:160
msgid "Minimum possible value for Y"
-msgstr "Valeur Minimum possible pour Y"
+msgstr "Valeur minimum possible pour Y"
#: src/gutenprintui2/curve.c:169
msgid "Maximum Y"
-msgstr "Y Maximum"
+msgstr "Maximum Y"
#: src/gutenprintui2/curve.c:170
msgid "Maximum possible value for Y"
-msgstr "Valeur Maximum possible pour Y"
+msgstr "Valeur maximum possible pour Y"
#: src/gutenprintui2/gammacurve.c:418
msgid "_Gamma value"
-msgstr "valeur _Gamma"
+msgstr "Valeur gamma"
#: src/cups/genppd.c:133
msgid "Printer Features"
-msgstr "Fonctionalités de l'imprimante"
+msgstr "Caractéristiques de l'imprimante"
#: src/cups/genppd.c:134
msgid "Output Control"
-msgstr "Contrôles de sortie"
+msgstr "contrôle de sortie"
#: src/cups/genppd.c:139
msgid "Common"
msgstr "Commun"
#: src/cups/genppd.c:140
-#, fuzzy
msgid "Extra 1"
-msgstr "Bac 1"
+msgstr "Extra 1"
#: src/cups/genppd.c:141
-#, fuzzy
msgid "Extra 2"
-msgstr "Bac 2"
+msgstr "Extra 2"
#: src/cups/genppd.c:142
-#, fuzzy
msgid "Extra 3"
-msgstr "Bac 3"
+msgstr "Extra 3"
#: src/cups/genppd.c:143
-#, fuzzy
msgid "Extra 4"
-msgstr "Bac 4"
+msgstr "Extra 4"
#: src/cups/genppd.c:144
msgid "Extra 5"
-msgstr ""
-
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-msgid "Gutenprint"
-msgstr "Gutenprint"
+msgstr "Extra 5"
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "French"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr "Non"
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr "Oui"
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
-msgstr "Ajustement fin"
+msgstr "Réglage fin"
#: src/escputil/escputil.c:70
msgid "Escputil version "
msgstr "Version d'escputil"
#: src/escputil/escputil.c:71
-#, fuzzy
msgid ""
", Copyright (C) 2000-2006 Robert Krawitz\n"
"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; type 'escputil -l' for details.\n"
msgstr ""
-", Copyright © 2000-2003 Robert Krawitz\n"
+", Copyright © 2000-2006 Robert Krawitz\n"
"Escputil ; pour plus de détails, tapez « escputil -l »\n"
"Ce logiciel est un logiciel libre, vous pouvez le redistribuer\n"
"sous certaines conditions; tapez « escputil -l » pour plus de détails.\n"
#: src/escputil/escputil.c:76
-#, fuzzy
msgid ""
"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
@@ -7143,7 +6582,7 @@ msgid ""
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
"Ce programme est un logiciel libre, vous pouvez le redistribuer et/ou le "
"modifier\n"
@@ -7164,7 +6603,6 @@ msgstr ""
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
#: src/escputil/escputil.c:119
-#, fuzzy
msgid ""
"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
" [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -7211,38 +6649,41 @@ msgid ""
msgstr ""
"Utilisation : escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
" [-P imprimante | -r périphérique] [-u] [-q] [-m "
-"modèle]\n"
+"modèle] [ -S ]\n"
"Effectue des opérations de maintenance sur les imprimantes EPSON Stylus "
"(R).\n"
-"Exemples : escputil --clean-head --printer stpex-on-third-floor\n"
-" escputil --ink-level --new --raw-device /dev/lp0\n"
+"Exemples : escputil --ink-level --raw-device /dev/usb/lp0\n"
+" escputil --clean-head --new --printer-name MyQueue\n"
"\n"
"Commandes :\n"
" -c|--clean-head Nettoie la tête d'impression\n"
-" -n|--nozzle-check\n"
+" -n|--nozzle-check Imprime un motif de test des buses.\n"
+" Les buses sales ou bouchées apparaîtront comme des\n"
+" trous dans le motif. Si vous en voyez vous devrier "
+"nettoyer \n"
+" tête d'impression.\n"
" -a|--align-head Aligne la tête d'impression. ATTENTION : une mauvaise\n"
" utilisation de cette fonction peut provoquer une "
"mauvaise\n"
-" qualité d'impression ou endommager l'imprimante.\n"
-" -o|--align-color Aligne la tête d'impression couleur (uniquement pour "
-"les\n"
-" Stylus Color 480 et 580). ATTENTION : une mauvaise\n"
-" utilisation de cette fonction peut provoquer une "
-"mauvaise\n"
-" qualité d'impression ou endommager l'imprimante.\n"
+" qualité d'impression et/ou endommager l'imprimante.\n"
" -s|--status Indique le statut de l'imprimante.\n"
-" -i|--ink-level Détecte le niveau d'encre de l'imprimante. Cela "
+" -i|--ink-level Récupère le niveau d'encre de l'imprimante. Cela "
"nécessite\n"
-" un accés en lecture/écriture sur le périphérique "
-"brut.\n"
+" un accés en lecture/écriture sur le périphérique \n"
+" en mode caractère (raw).\n"
+" -e|--extended-ink-info Récupère les informations complémentaires \n"
+" sur les encres. Cette commande nécessite\n"
+" un accés en lecture/écriture sur le périphérique \n"
+" en mode caractère (raw).\n"
" -d|--identify Demande à l'imprimante des renseignements sur la "
"marque\n"
" et le modèle. Cela nécessite un accés en lecture/"
"écriture\n"
-" sur le périphérique brut.\n"
-" -l|--license Affiche la license de ce programme.\n"
-" -M|--list-models Affiche les modèles d'imprimante disponibles.\n"
+" sur le périphérique en mode caractère (raw) .\n"
+" -l|--license Affiche la licence de ce programme.\n"
+" -M|--list-models Affiche les modèles d'imprimante supportés.\n"
" -h|--help Affiche ce message d'aide.\n"
+" \n"
"Options :\n"
" -P|--printer-name Indique le nom de la file d'attente d'impression à \n"
" utiliser. Par défaut, utilisation de l'imprimante du \n"
@@ -7252,13 +6693,15 @@ msgstr ""
" pour l'impression.\n"
" -u|--new L'imprimante est une imprimante récente (Stylus Color "
"740\n"
-" ou plus récent).\n"
-" -q|--quiet N'affiche pas la bannière.\n"
+" ou plus récent). Utile uniquement si le périphérique \n"
+" n'est pas en mode caractère (raw). -q|--"
+"quiet N'affiche pas la bannière.\n"
+" -S|--short-name Affiche le nom court de l'imprimante avec --identify.\n"
" -m|--model Indique le modèle précis pour l'alignement des têtes.\n"
-"\n"
+" -C|--choices Nombre de choix de motifs pour l'alignement\n"
+" -p|--patterns Numéro des jeux de motifs pour l'alignment\n"
#: src/escputil/escputil.c:161
-#, fuzzy
msgid ""
"Usage: escputil [OPTIONS] [COMMAND]\n"
"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7301,8 +6744,8 @@ msgid ""
" -C Specify the number of pattern choices for alignment\n"
" -p Specify the number of sets of patterns for alignment\n"
msgstr ""
-"Utilisation: escputil [OPTIONS] [COMMANDE]\n"
-"Utilisation: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"Usage: escputil [OPTIONS] [COMMANDE]\n"
+"Usage: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
" [-P printer | -r device] [-u] [-q] [-m model]\n"
"Maintenance sur les imprimantes EPSON Stylus (R).\n"
"Exemples: escputil -c -P stpex-on-third-floor\n"
@@ -7323,7 +6766,7 @@ msgstr ""
"peut\n"
" conduire à une piètre qualité d'impression et/ou endommager "
"l'imprimante.\n"
-" -s Retrouver le statut de l'imprimante.\n"
+" -s Retrouver le status de l'imprimante.\n"
" -i Obtenir le niveau d'encre de l'imprimante. Ceci nécessite\n"
" un accès en lecture/écriture au périphérique d'entrée.\n"
" -d Interroge l'imprimante sur la marque et le modèle de l'imprimante."
@@ -7334,7 +6777,7 @@ msgstr ""
" -h Imprime ce message d'aide.\n"
" Options:\n"
" -P Spécifie le nom de la queue d'imprimante sur laquelle opérer.\n"
-" Par défaut l'imprimante système.\n"
+" Par déaut l'imprimante système.\n"
" -r Spécifie le nom du périphérique sur lequel écrire directement\n"
" plutôt que de passer via une queue d'impression.\n"
" -u L'imprimante est une nouvelle imprimante (Stylus Color 740 ou plus "
@@ -7355,12 +6798,12 @@ msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
#: src/escputil/escputil.c:369
#, c-format
msgid "Alignment choices must be at least 1."
-msgstr ""
+msgstr "Le choix de l'alignement doit être au moins 1."
#: src/escputil/escputil.c:376
#, c-format
msgid "Alignment passes must be at least 1."
-msgstr ""
+msgstr "Le nombre de passes d'alignement doit être au moins de 1."
#: src/escputil/escputil.c:381
#, c-format
@@ -7370,17 +6813,17 @@ msgstr "Option inconnue %c\n"
#: src/escputil/escputil.c:389
#, c-format
msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Utilisation: %s [OPTIONS] commande\n"
+msgstr "Usage: %s [OPTIONS] command\n"
#: src/escputil/escputil.c:391
#, c-format
msgid "Type `%s --help' for more information.\n"
-msgstr ""
+msgstr "Tapez `%s --help' pour plus d'information.\n"
#: src/escputil/escputil.c:393
#, c-format
msgid "Type `%s -h' for more information.\n"
-msgstr ""
+msgstr "Tapez `%s -h' pour plus d'information.\n"
#: src/escputil/escputil.c:459
#, c-format
@@ -7400,26 +6843,30 @@ msgstr "Impossible d'envoyer la commande à l'imprimante\n"
#: src/escputil/escputil.c:568
#, c-format
msgid "Read from printer timed out\n"
-msgstr ""
+msgstr "Lecture données de l'imprimante: temps excédé\n"
#: src/escputil/escputil.c:573
#, c-format
msgid "Cannot read from %s: %s\n"
msgstr "Impossible de lire à partir de %s : %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Impossible d'écrire sur %s : %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7428,7 +6875,7 @@ msgstr ""
"\n"
"Impossible d'écrire sur %s : %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7439,230 +6886,232 @@ msgstr ""
"Impossible de détecter le type de l'imprimante.\n"
"Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr "Inconnu"
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
-msgstr ""
+msgstr "Etat: Erreur\n"
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
-msgstr ""
+msgstr "Etat: auto-impression\n"
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
-msgstr ""
+msgstr "Etat: occupé\n"
-#: src/escputil/escputil.c:1020
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1036
+#, c-format
msgid "Status: Waiting\n"
-msgstr "Saturation"
+msgstr "Etat: Attente\n"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
-msgstr ""
+msgstr "Etat: Libre\n"
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
-msgstr ""
+msgstr "Etat: Pause\n"
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
-msgstr ""
+msgstr "Etat: Nettoyage\n"
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
-msgstr ""
+msgstr "Etat: Configuration usine\n"
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
-msgstr ""
+msgstr "Etat: Arrêt en cours\n"
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
-msgstr ""
+msgstr "Etat: Inconnu (%d)\n"
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
-msgstr ""
+msgstr "Erreur: Erreur fatale\n"
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
-msgstr ""
+msgstr "Erreur: une autre interface est sélectionnée\n"
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
-msgstr ""
+msgstr "Erreur: ouvercle ouvert\n"
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
-msgstr ""
+msgstr "Erreur: Bourrage papier\n"
-#: src/escputil/escputil.c:1061
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1077
+#, c-format
msgid "Error: Ink out\n"
-msgstr "Erreur en entrée\n"
+msgstr "Erreur: plus d'encre\n"
-#: src/escputil/escputil.c:1064
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1080
+#, c-format
msgid "Error: Paper out\n"
-msgstr "Erreur en entrée\n"
+msgstr "Erreur: Pas de papier\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
-msgstr ""
+msgstr "Erreur: Attente retour à la position de repos\n"
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
-msgstr ""
+msgstr "Erreur: double chargement\n"
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
-msgstr ""
+msgstr "Erreur: Erreur massicot non récupérable\n"
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
-msgstr ""
+msgstr "Erreur: bourrage massicot (récupérable)\n"
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
-msgstr ""
+msgstr "Erreur: Support CD sorti\n"
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
-msgstr ""
+msgstr "Erreur: Chargement de la carte\n"
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
-msgstr ""
+msgstr "Erreur: couvercle du support ouvert\n"
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
-msgstr ""
+msgstr "Error: Inconnue (%d)\n"
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
-msgstr ""
+msgstr "Impression autotest des buses\n"
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#, c-format
msgid "Ink Levels:\n"
-msgstr "niveaux d'encre"
+msgstr "Niveau d'encres:\n"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Encre couleur"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Pourcentage restant"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
-msgstr ""
+msgstr "Attention: Encre noire niveau bas\n"
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
-msgstr ""
+msgstr "Attention: Inconnu (%d)\n"
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
-msgstr ""
+msgstr "Nom du travail: "
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
-msgstr "niveaux d'encre"
+msgstr "niveau d'encres"
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
-msgstr "statut"
+msgstr "état"
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, c-format
msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Obtenir %s requiert d'utiliser un périphérique d'entrée\n"
+msgstr ""
+"Obtenir %s demande d'utiliser un périphérique en mode caractère (raw "
+"device).\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr ""
-"Obtenir les informations d'encre étendues requiert l'utilisation d'un "
-"périphérique d'entrée\n"
+"Obtenir les niveaux d'encre demande d'utiliser un périphérique en mode "
+"caractère (raw device)\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr "Numéro de pièce"
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr "Date"
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
"L'identification de l'imprimante demande d'utiliser un périphérique "
-"d'entrée\n"
+"caractère (raw devive)\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, c-format
msgid "Cannot identify printer model.\n"
-msgstr "Ne peux identifier le modèle d'imprimante.\n"
+msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Nettoyage des têtes...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
"Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
"dans l'imprimante\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7747,7 +7196,7 @@ msgstr ""
"durant cette opération.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7823,17 +7272,17 @@ msgstr ""
"durant cette opération.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
-msgstr ""
+msgstr "uitte.\n"
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7853,13 +7302,13 @@ msgstr ""
"Il vous sera ensuite demandé de confirmer votre choix\n"
"Que voulez-vous faire (s, q, r) ?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -7867,7 +7316,7 @@ msgstr ""
"Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
"enregistrer :\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7877,7 +7326,7 @@ msgstr ""
"Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
"opération.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7886,12 +7335,12 @@ msgstr ""
"S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
"reprendre l'opération d'alignement.\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Répétition de l'opération d'alignement.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7906,17 +7355,17 @@ msgstr ""
"Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
"enregistrer les réglages de votre imprimante.\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "À propos de l'enregistrement des réglages..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "Échec !\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7925,27 +7374,27 @@ msgstr ""
"Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
"l'opération d'alignement.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "Succès !\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Commande non reconnue.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "La dernière commande n'a pas été confirmée.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7962,12 +7411,12 @@ msgstr ""
"S'il vous plait placez une feuillle de papier dans votre imprimante\n"
"pour commencer l'opération d'ailgnement des têtes.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Pressez Entrée pour continuer > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7978,42 +7427,42 @@ msgstr ""
"lignes dans chaque trame.\n"
"Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Passe #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Veuillez insérer une feuille de papier vierge.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Nombre hors-intervalle !\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Je ne comprends pas ce que vous avez tapé !\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Tentative de réglage de l'alignement..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "Succès.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -8026,7 +7475,7 @@ msgstr ""
"trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n"
"devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Erreur en entrée\n"
@@ -8035,7 +7484,7 @@ msgstr "Erreur en entrée\n"
msgid "Printing..."
msgstr "Impression en cours..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Fichier/Imprimer..."
@@ -8050,775 +7499,118 @@ msgid ""
"ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
"not match the PPD file (%s).\n"
msgstr ""
-"ijsgutenprint: la version de Gutenprint software installée (%s)\n"
-" ne correspond pas au fichier PPD (%s). Si vous avez mis à jour recemment\n"
-" votre version de Gutenprint, vous devez reinstaller toutes les files "
-"d'impression.\n"
-" Veuillez vous référer à la documentation fournie, ou a la commande "
-"``foomatic-ppdfile''\n"
-" pour plus d'instructions.\n"
-"ERROR: la version de Gutenprint software installée (%s) ne correspond pas au "
-"fichier PPD (%s).\n"
-
-#: src/ghost/ijsgutenprint.c:190
-#, fuzzy, c-format
+
+#: src/ghost/ijsgutenprint.c:191
+#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "Mauvais intervalle des couleurs : bps %d canaux %d intervalle %s\n"
+msgstr ""
+"Erreur: ijsgutenprint: Mauvais espace de couleur : bps %d canaux %d espace %"
+"s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "Pas de tampon de ligne\n"
+msgstr "Erreur: ijsgutenprint: Pas de buffer de ligne\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Impossible d'interpréter le paramètre %s=%s (un nombre est attendu)\n"
+msgstr ""
+"Erreur: ijsgutenprint: Impossible d'interpréter le paramètre %s=%s (un "
+"nombre est attendu)\n"
-#: src/ghost/ijsgutenprint.c:497
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:498
+#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "L'imprimante doit être spécifiée avec le -sModel\n"
+msgstr ""
+"Erreur: ijsgutenprint:L'imprimante doit être spécifiée avec -sDeviceModel\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "L'imprimante %s n'est pas un modèle connu\n"
+msgstr "Erreur: ijsgutenprint: L'imprimante %s n'est pas un modèle connu\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
-msgstr ""
+msgstr "ijsgutenprint: DeviceModel %s inconnu\n"
-#: src/ghost/ijsgutenprint.c:699
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:700
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsgutenprint: ne peut pas analyser TopLeft %s\n"
-#: src/ghost/ijsgutenprint.c:722
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:723
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsgutenprint:: ne peut pas analyser PaperSize %s\n"
-#: src/ghost/ijsgutenprint.c:794
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:795
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsgutenprint: ne peux pas analyser la courbe %s\n"
-#: src/ghost/ijsgutenprint.c:801
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:802
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsguteprint: ne peut pas analyser %s float %s\n"
-#: src/ghost/ijsgutenprint.c:808
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:809
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s int %s\n"
-#: src/ghost/ijsgutenprint.c:815
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:816
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s dimension %s\n"
-#: src/ghost/ijsgutenprint.c:829
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:830
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s\n"
+msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s booléen %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Mauvais paramètre %s %d\n"
+msgstr "Erreur: ijsgutenprint: mauvais paramètre %s %d\n"
-#: src/ghost/ijsgutenprint.c:866
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:867
+#, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
+msgstr "Erreur: ijsgutenprint: mauvais code (clef) %d\n"
-#: src/ghost/ijsgutenprint.c:1303
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1308
+#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "image_init échec %d\n"
+msgstr "Erreur: ijsgutenprint: image_init échec %d\n"
-#: src/ghost/ijsgutenprint.c:1314
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1319
+#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Incapable d'ouvrir le descripteur de fichier : %s\n"
+msgstr ""
+"Erreur: ijsgutenprint: Impossible d'ouvrir le descripteur de fichier : %s\n"
-#: src/ghost/ijsgutenprint.c:1326
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1331
+#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Incapable d'ouvrir %s : %s\n"
+msgstr "Erreur: ijsgutenprint: Impossible d'ouvrir %s : %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "Imprimante inconnue %s\n"
+msgstr "Erreur: ijsgutenprint: Imprimante inconnue %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Mauvais paramètres, ne peut pas continuer !\n"
+msgstr "Erreur: ijsgutenprint: Mauvais paramètres, ne peut pas continuer !\n"
-#: src/ghost/ijsgutenprint.c:1526
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1534
+#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "ijs_server_get_page_header échec %d\n"
-
-#~ msgid "Canon BJC 4400 photo"
-#~ msgstr "Canon BJC 4400 photo"
-
-#~ msgid "Canon PIXMA iP4000"
-#~ msgstr "Canon PIXMA iP4000"
-
-#~ msgid "EPSON Stylus C50"
-#~ msgstr "EPSON Stylus C50"
-
-#~ msgid "EPSON Stylus C60"
-#~ msgstr "EPSON Stylus C60"
-
-#~ msgid "EPSON Stylus C61"
-#~ msgstr "EPSON Stylus C61"
-
-#~ msgid "EPSON Stylus C62"
-#~ msgstr "EPSON Stylus C62"
-
-#~ msgid "EPSON Stylus C70"
-#~ msgstr "EPSON Stylus C70"
-
-#~ msgid "EPSON Stylus C80"
-#~ msgstr "EPSON Stylus C80"
-
-#~ msgid "EPSON Stylus C82"
-#~ msgstr "EPSON Stylus C82"
-
-#~ msgid "EPSON Stylus Color"
-#~ msgstr "EPSON Stylus Color"
-
-#~ msgid "EPSON Stylus Color Pro"
-#~ msgstr "EPSON Stylus Color Pro"
-
-#~ msgid "EPSON Stylus Color Pro XL"
-#~ msgstr "EPSON Stylus Color Pro XL"
-
-#~ msgid "EPSON Stylus Color 400"
-#~ msgstr "EPSON Stylus Color 400"
-
-#~ msgid "EPSON Stylus Color 440"
-#~ msgstr "EPSON Stylus Color 440"
-
-#~ msgid "EPSON Stylus Color 460"
-#~ msgstr "EPSON Stylus Color 460"
-
-#~ msgid "EPSON Stylus Color 480"
-#~ msgstr "EPSON Stylus Color 480"
-
-#~ msgid "EPSON Stylus Color 500"
-#~ msgstr "EPSON Stylus Color 500"
-
-#~ msgid "EPSON Stylus Color 580"
-#~ msgstr "EPSON Stylus Color 580"
-
-#~ msgid "EPSON Stylus Color 600"
-#~ msgstr "EPSON Stylus Color 600"
-
-#~ msgid "EPSON Stylus Color 640"
-#~ msgstr "EPSON Stylus Color 640"
-
-#~ msgid "EPSON Stylus Color 660"
-#~ msgstr "EPSON Stylus Color 660"
-
-#~ msgid "EPSON Stylus Color 670"
-#~ msgstr "EPSON Stylus Color 670"
-
-#~ msgid "EPSON Stylus Color 680"
-#~ msgstr "EPSON Stylus Color 680"
-
-#~ msgid "EPSON Stylus Color 740"
-#~ msgstr "EPSON Stylus Color 740"
-
-#~ msgid "EPSON Stylus Color 760"
-#~ msgstr "EPSON Stylus Color 760"
-
-#~ msgid "EPSON Stylus Color 777"
-#~ msgstr "EPSON Stylus Color 777"
-
-#~ msgid "EPSON Stylus Color 800"
-#~ msgstr "EPSON Stylus Color 800"
-
-#~ msgid "EPSON Stylus Color 850"
-#~ msgstr "EPSON Stylus Color 850"
-
-#~ msgid "EPSON Stylus Color 860"
-#~ msgstr "EPSON Stylus Color 860"
-
-#~ msgid "EPSON Stylus Color 880"
-#~ msgstr "EPSON Stylus Color 880"
-
-#~ msgid "EPSON Stylus Color 83"
-#~ msgstr "EPSON Stylus Color 83"
-
-#~ msgid "EPSON Stylus Color 900"
-#~ msgstr "EPSON Stylus Color 900"
-
-#~ msgid "EPSON Stylus Color 980"
-#~ msgstr "EPSON Stylus Color 980"
-
-#~ msgid "EPSON Stylus Color 1160"
-#~ msgstr "EPSON Stylus Color 1160"
-
-#~ msgid "EPSON Stylus Color 1500"
-#~ msgstr "EPSON Stylus Color 1500"
-
-#~ msgid "EPSON Stylus Color 1520"
-#~ msgstr "EPSON Stylus Color 1520"
-
-#~ msgid "EPSON Stylus Color 3000"
-#~ msgstr "EPSON Stylus Color 3000"
-
-#~ msgid "EPSON Stylus Photo"
-#~ msgstr "EPSON Stylus Photo"
-
-#~ msgid "EPSON Stylus Photo 700"
-#~ msgstr "EPSON Stylus Photo 700"
-
-#~ msgid "EPSON Stylus Photo EX"
-#~ msgstr "EPSON Stylus Photo EX"
-
-#~ msgid "EPSON Stylus Photo 720"
-#~ msgstr "EPSON Stylus Photo 720"
-
-#~ msgid "EPSON Stylus Photo 750"
-#~ msgstr "EPSON Stylus Photo 750"
-
-#~ msgid "EPSON Stylus Photo 780"
-#~ msgstr "EPSON Stylus Photo 780"
-
-#~ msgid "EPSON Stylus Photo 785EPX"
-#~ msgstr "EPSON Stylus Photo 785EPX"
-
-#~ msgid "EPSON Stylus Photo 790"
-#~ msgstr "EPSON Stylus Photo 790"
-
-#~ msgid "EPSON Stylus Photo 810"
-#~ msgstr "EPSON Stylus Photo 810"
-
-#~ msgid "EPSON Stylus Photo 820"
-#~ msgstr "EPSON Stylus Photo 820"
-
-#~ msgid "EPSON Stylus Photo 830"
-#~ msgstr "EPSON Stylus Photo 830"
-
-#~ msgid "EPSON Stylus Photo 870"
-#~ msgstr "EPSON Stylus Photo 870"
-
-#~ msgid "EPSON Stylus Photo 875"
-#~ msgstr "EPSON Stylus Photo 875"
-
-#~ msgid "EPSON Stylus Photo 890"
-#~ msgstr "EPSON Stylus Photo 890"
-
-#~ msgid "EPSON Stylus Photo 895"
-#~ msgstr "EPSON Stylus Photo 895"
-
-#~ msgid "EPSON Stylus Photo 900"
-#~ msgstr "EPSON Stylus Photo 900"
-
-#~ msgid "EPSON Stylus Photo 915"
-#~ msgstr "EPSON Stylus Photo 915"
-
-#~ msgid "EPSON Stylus Photo 925"
-#~ msgstr "EPSON Stylus Photo 925"
-
-#~ msgid "EPSON Stylus Photo 950"
-#~ msgstr "EPSON Stylus Photo 950"
-
-#~ msgid "EPSON Stylus Photo 960"
-#~ msgstr "EPSON Stylus Photo 960"
-
-#~ msgid "EPSON Stylus Photo 1200"
-#~ msgstr "EPSON Stylus Photo 1200"
-
-#~ msgid "EPSON Stylus Photo 1270"
-#~ msgstr "EPSON Stylus Photo 1270"
-
-#~ msgid "EPSON Stylus Photo 1280"
-#~ msgstr "EPSON Stylus Photo 1280"
-
-#~ msgid "EPSON Stylus Photo 1290"
-#~ msgstr "EPSON Stylus Photo 1290"
-
-#~ msgid "EPSON Stylus Photo 2000P"
-#~ msgstr "EPSON Stylus Photo 2000P"
-
-#~ msgid "EPSON Stylus Photo 2100"
-#~ msgstr "EPSON Stylus Photo 2100"
-
-#~ msgid "EPSON Stylus Photo 2200"
-#~ msgstr "EPSON Stylus Photo 2200"
-
-#~ msgid "EPSON Stylus Pro 5000"
-#~ msgstr "EPSON Stylus Pro 5000"
-
-#~ msgid "EPSON Stylus Pro 5500"
-#~ msgstr "EPSON Stylus Pro 5500"
-
-#~ msgid "EPSON Stylus Pro 7000"
-#~ msgstr "EPSON Stylus Pro 7000"
-
-#~ msgid "EPSON Stylus Pro 7500"
-#~ msgstr "EPSON Stylus Pro 7500"
-
-#~ msgid "EPSON Stylus Pro 7600"
-#~ msgstr "EPSON Stylus Pro 7600"
-
-#~ msgid "EPSON Stylus Pro 9000"
-#~ msgstr "EPSON Stylus Pro 9000"
-
-#~ msgid "EPSON Stylus Pro 9500"
-#~ msgstr "EPSON Stylus Pro 9500"
-
-#~ msgid "EPSON Stylus Pro 9600"
-#~ msgstr "EPSON Stylus Pro 9600"
-
-#~ msgid "EPSON Stylus Pro 10000"
-#~ msgstr "EPSON Stylus Pro 10000"
-
-#~ msgid "EPSON Stylus Scan 2000"
-#~ msgstr "EPSON Stylus Scan 2000"
-
-#~ msgid "EPSON Stylus Scan 2500"
-#~ msgstr "EPSON Stylus Scan 2500"
-
-#~ msgid "EPSON CL-700"
-#~ msgstr "EPSON CL-700"
-
-#~ msgid "EPSON CL-750"
-#~ msgstr "EPSON CL-750"
-
-#~ msgid "EPSON CL-760"
-#~ msgstr "EPSON CL-760"
-
-#~ msgid "EPSON E-100"
-#~ msgstr "EPSON E-100"
-
-#~ msgid "EPSON MC-2000"
-#~ msgstr "EPSON MC-2000"
-
-#~ msgid "EPSON MC-7000"
-#~ msgstr "EPSON MC-7000"
-
-#~ msgid "EPSON MC-10000"
-#~ msgstr "EPSON MC-10000"
-
-#~ msgid "EPSON MJ-6000C"
-#~ msgstr "EPSON MJ-6000C"
-
-#~ msgid "HP DeskJet 600/600C"
-#~ msgstr "HP DeskJet 600/600C"
-
-#~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "L'imprimante ne supporte pas l'affichage des tyoes d'encres!\n"
-
-#, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Impossible d'interpréter le message envoyé par l'imprimante\n"
-
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Ajuste le niveau de jaune de l'impression"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr ""
-#~ "Le status de l'imprimante demande d'utiliser un périphérique d'entrée\n"
-
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Ajuste le niveau de jaune de l'impression"
-
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "L'alignement de l'imprimante doit être fait avec un périphérique ou "
-#~ "autrement\n"
-#~ "l'option -m doit être utilisée pour spécifier une imprimante.\n"
-
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Tentative de détection du modèle de l'imprimante..."
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible d'ouvrir %s en lecture/écriture : %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Le modèle d'imprimante %s est inconnu.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "À propos de Gimp-Print"
-
-#, fuzzy
-#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
-#~ msgstr ""
-#~ "Règle la luminosité de l'impression.\n"
-#~ "0 est noir plein, 2 est blanc plein"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Entrez la commande correcte à votre imprimante pour imprimer. S'il vous "
-#~ "plait n'enlevez pas le '-l' ou '-oraw' de la ligne de commande ou "
-#~ "l'impression va probablement échouer !"
-
-#~ msgid "PPD File?"
-#~ msgstr "Fichier PPD ?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s : l'option « %s » est ambigüe\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s : l'option « --%s » n'accepte pas de paramètre\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s : l'option « %c%s » n'accepte pas de paramètre\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s : l'option « %s » nécessite un paramètre\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s : option inconnue « --%s »\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s : option inconnue « %c%s »\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s : option illégale -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s : option invalide -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s : cette option nécessite un paramètre -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s : l'option « -W %s » est ambigüe\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s : l'option « -W %s » n'accepte pas de paramètre\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Luminosité :"
-
-#, fuzzy
-#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Dimensionne l'impression par rapport à la taille de la page"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Alimentation rouleau"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 ppp Unirectionnel"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f de %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#, fuzzy
-#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimise la sortie pour le type d'image imprimée"
-
-#~ msgid "Solid Colors"
-#~ msgstr "Tons continus"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#~ msgid ""
-#~ "Please read these instructions very carefully before proceeding.\n"
-#~ "\n"
-#~ "This utility lets you align the color print head of your Epson Stylus "
-#~ "inkjet\n"
-#~ "printer. Misuse of this utility may cause your print quality to degrade\n"
-#~ "and possibly damage your printer. This utility has not been reviewed by\n"
-#~ "Seiko Epson for correctness, and is offered with no warranty at all. "
-#~ "The\n"
-#~ "entire risk of using this utility lies with you.\n"
-#~ "\n"
-#~ "This utility prints %d overprinting test patterns on one piece of paper.\n"
-#~ "That is, it prints one pattern and ejects the page. You must then "
-#~ "reinsert\n"
-#~ "the same page, and it will print another pattern. Each pattern consists "
-#~ "of\n"
-#~ "a set of choices numbered between %d and %d.\n"
-#~ "\n"
-#~ "When you inspect the patterns, you should find one patch to have the\n"
-#~ "smoothest texture (least ``grain''). You should inspect the patches "
-#~ "very\n"
-#~ "carefully to choose the best one. We suggest using Photo Quality Inkjet\n"
-#~ "Paper or a similar high quality paper for this test. If you do not find\n"
-#~ "a smooth pattern, you should repeat the test.\n"
-#~ "\n"
-#~ "After you inspect the choices and select a patch, you will be offered "
-#~ "the\n"
-#~ "choices of (s)aving the result in the printer, (r)epeating the process,\n"
-#~ "or (q)uitting without saving. Quitting will not restore the previous\n"
-#~ "settings, but powering the printer off and back on will. If you quit,\n"
-#~ "you must repeat the entire process if you wish to later save the "
-#~ "results.\n"
-#~ "It is essential that you not turn your printer off during this "
-#~ "procedure.\n"
-#~ "\n"
-#~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n"
-#~ "damage your printer!\n"
-#~ msgstr ""
-#~ "S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
-#~ "\n"
-#~ "Cet utilitaire vous permet d'aligner les têtes d'impression couleur de "
-#~ "votre \n"
-#~ "imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
-#~ "utilitaire\n"
-#~ "peut dégrader la qualité d'impression de votre imprimante et endommager "
-#~ "votre\n"
-#~ "imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
-#~ "n'offre\n"
-#~ "aucune garantie. L'entière responsabilité de son utilisation vous "
-#~ "incombe. \n"
-#~ "\n"
-#~ "Cet utilitaire imprime %d trames superposées sur une feuille de papier.\n"
-#~ "C'est à dire, il imprime une trame et éjecte la page. Vous devez "
-#~ "réinsérer\n"
-#~ "la même page et il imprimera une autre trame. Chaque trame consiste en\n"
-#~ "un jeu de choix numérotés entre %d et %d.\n"
-#~ "\n"
-#~ "Quand vous inspectez la trame, vous devriez trouver une parcelle qui a\n"
-#~ "la texture la plus fine (les grains les plus fins). Vous devriez "
-#~ "inspecter\n"
-#~ "les parcelles très attentivement pour trouver la meilleure. Nous "
-#~ "suggérons\n"
-#~ "d'utiliser du papier pour jet d'encre Photo Quality ou un papier de\n"
-#~ "qualité similaire pour ce test. Si vous ne trouvez pas une trame fine,\n"
-#~ "vous devriez répéter l'opération.\n"
-#~ "\n"
-#~ "Après avoir inspecté les choix et sélectionnée une parcelle vous devrez\n"
-#~ "choisir entre (s)auvegarder le résultat dans l'imprimante, (r)épéter "
-#~ "l'opération,\n"
-#~ "ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
-#~ "précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
-#~ "quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
-#~ "les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
-#~ "durant cette opération.\n"
-#~ "\n"
-#~ "ATTENTION : CETTE FONCTION N'A PAS ENCORE ÉTÉ TESTÉE. Elle peut\n"
-#~ "ne pas fonctionner et elle peut endommager votre imprimante !\n"
-
-#~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr ""
-#~ "L'imprimante %s n'a pas besoin d'un alignement des têtes couleurs.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please inspect the print, and choose the pattern in each set.\n"
-#~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
-#~ msgstr ""
-#~ "S'il vous plait inspectez l'impression et choisissez la meilleure paire "
-#~ "de lignes dans chaque trame.\n"
-#~ "Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter "
-#~ "l'opération.\n"
-
-#, fuzzy
-#~ msgid "Model %d out of range.\n"
-#~ msgstr "Nombre hors-intervalle !\n"
-
-#~ msgid "Right Border:"
-#~ msgstr "Bordure droite :"
-
-#~ msgid "Bottom Border:"
-#~ msgstr "Bordure basse :"
-
-#~ msgid "Size"
-#~ msgstr "Taille"
-
-#~ msgid "Image / Output Settings"
-#~ msgstr "Image / Paramètres de sortie"
-
-#, fuzzy
-#~ msgid "GIMP-print"
-#~ msgstr "Imprimer"
-
-#, fuzzy
-#~ msgid "Resolutions"
-#~ msgstr "Résolution"
-
-#~ msgid "Media Type:"
-#~ msgstr "Type de support :"
-
-#~ msgid "Type of media you're printing to"
-#~ msgstr "Type de support sur lequel vous imprimez"
-
-#~ msgid "Media Size:"
-#~ msgstr "Taille du support (papier) :"
-
-#~ msgid "Size of paper that you wish to print to"
-#~ msgstr "Taille du papier sur lequel vous souhaitez imprimer"
-
-#~ msgid "Media Source:"
-#~ msgstr "Source du support :"
-
-#~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "Source (bac) du support vers lequel vous imprimez"
-
-#~ msgid "Ink Type:"
-#~ msgstr "Type d'encre :"
-
-#~ msgid "Resolution:"
-#~ msgstr "Résolution :"
-
-#~ msgid "Print in black and white (no color, and no shades of gray)"
-#~ msgstr "Imprimer en noir et blanc (pas de couleurs ni de niveaux de gris)"
-
-#~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "Couleur plus rapide et brillante pour le texte et les tracés"
-
-#~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr ""
-#~ "Meilleur pour les images dominées par des régions de couleurs pleines"
-
-#~ msgid ""
-#~ "Slowest, but most accurate and smoothest color for continuous tone images "
-#~ "and photographs"
-#~ msgstr ""
-#~ "Plus lent, mais plus précis et des couleurs plus fines pour les images à "
-#~ "tons continus et les photographies"
-
-#~ msgid "Dither Algorithm:"
-#~ msgstr "Algorithme de tramage :"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot read from %s: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible de lire depuis %s : %s\n"
-
-#~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s hors-intervalle (valeur %f, mini %f, maxi %f)\n"
-
-#~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s n'est pas un algorithme de tramage valide\n"
-
-#~ msgid ""
-#~ "Please re-insert the same alignment sheet in the printer when it is\n"
-#~ "finished printing.\n"
-#~ msgstr ""
-#~ "Veuillez réinsérer la même feuille d'alignement dans l'imprimante\n"
-#~ "quand l'impression sera terminée.\n"
-
-#~ msgid ""
-#~ "Inspect the alignment sheet, and determine which pattern is the "
-#~ "smoothest.\n"
-#~ "This pattern will appear to have the least ``grain''.\n"
-#~ "If you cannot find a smooth pattern, please select the number for the\n"
-#~ "best pattern, and repeat the procedure.\n"
-#~ "Type a pattern number, or '?' for help.\n"
-#~ msgstr ""
-#~ "Inspectez la feuille d'alignement et déterminez quelle trame est la plus "
-#~ "fine.\n"
-#~ "Cette trame semble avoir le grain le plus fin.\n"
-#~ "Si vous ne pouvez pas trouver une trame fine, sélectionnez le nombre\n"
-#~ "correspondant à la meilleure trame et répétez l'opération.\n"
-#~ "Saisissez un nombre de trame ou « ? » pour l'aide.\n"
-
-#~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "La meilleure trame doit être comprise entre 1 et %d.\n"
-
-#~ msgid "Set the contrast of the print"
-#~ msgstr "Défini le contraste de l'impression"
-
-#~ msgid "Cyan:"
-#~ msgstr "Cyan :"
-
-#~ msgid "Magenta:"
-#~ msgstr "Magenta :"
-
-#~ msgid "Yellow:"
-#~ msgstr "Jaune :"
-
-#~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "Le paramètre %s est hors-intervalle (valeur %f, mini %f, maxi %f)\n"
-
-#~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "Le paramètre %s est hors-intervalle (valeur %d, mini %d, maxi %d)\n"
-
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Option inconnue %s\n"
-
-#~ msgid "1440 x 360 DPI"
-#~ msgstr "1440 x 360 ppp"
-
-#~ msgid "1440 x 360 DPI Unidirectional"
-#~ msgstr "1440 x 360 ppp unidirectionnel"
-
-#~ msgid "1440 x 360 DPI High Quality Uni"
-#~ msgstr "1440 x 360 ppp Haute qualité unidirectionnel"
-
-#~ msgid "13x19"
-#~ msgstr "13x19"
-
-#~ msgid "Monarch"
-#~ msgstr "Monarch"
-
-#~ msgid "Long 3"
-#~ msgstr "Long 3"
-
-#~ msgid "Long 4"
-#~ msgstr "Long 4"
-
-#~ msgid "Kaku"
-#~ msgstr "Kaku"
+msgstr "Erreur: ijsgutenprint: Obtenir la ligne suivante à échoué à %.0f\n"
-#~ msgid "HP Greeting Card"
-#~ msgstr "Carte de remerciement HP"
+#~ msgid "Gutenprint"
+#~ msgstr "Gutenprint"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index d54f445..46fb489 100644
--- a/po/gutenprint.pot
+++ b/po/gutenprint.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,8 +16,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
msgstr ""
@@ -29,81 +31,84 @@ msgstr ""
msgid "Hybrid EvenTone"
msgstr ""
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
msgstr ""
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
msgstr ""
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
msgid "UniTone"
msgstr ""
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr ""
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr ""
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr ""
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr ""
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr ""
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
"regions are not solid."
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -315,7 +320,7 @@ msgstr ""
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
msgstr ""
@@ -330,58 +335,58 @@ msgstr ""
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
msgstr ""
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
msgstr ""
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr ""
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr ""
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr ""
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr ""
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr ""
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr ""
@@ -389,22 +394,22 @@ msgstr ""
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr ""
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -414,13 +419,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
msgstr ""
@@ -428,87 +433,87 @@ msgstr ""
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
msgstr ""
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
msgid "Cyan Density"
msgstr ""
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
msgstr ""
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
msgid "Magenta Density"
msgstr ""
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
msgstr ""
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
msgid "Yellow Density"
msgstr ""
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
msgstr ""
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
msgid "Black Density"
msgstr ""
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
msgstr ""
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
msgstr ""
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
msgstr ""
@@ -516,13 +521,13 @@ msgstr ""
msgid "Light Yellow Transition"
msgstr ""
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -563,28 +568,28 @@ msgid "CMY Color"
msgstr ""
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr ""
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr ""
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr ""
@@ -764,15 +769,15 @@ msgstr ""
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr ""
@@ -780,15 +785,15 @@ msgstr ""
msgid "Adjust the cyan gamma"
msgstr ""
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr ""
@@ -796,15 +801,15 @@ msgstr ""
msgid "Adjust the magenta gamma"
msgstr ""
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr ""
@@ -812,10 +817,10 @@ msgstr ""
msgid "Adjust the yellow gamma"
msgstr ""
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -823,7 +828,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr ""
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -832,10 +837,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr ""
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1131,155 +1136,155 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr ""
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr ""
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
msgstr ""
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
msgstr ""
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
msgid "Manual Sheet Guide"
msgstr ""
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
msgid "Manual Feed (Front)"
msgstr ""
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
msgstr ""
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
msgid "Photo Board"
msgstr ""
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr ""
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
msgstr ""
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
msgstr ""
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
msgid "Super Photo"
msgstr ""
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
msgid "Ultra Photo"
msgstr ""
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr ""
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
msgstr ""
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
msgstr ""
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
msgstr ""
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
msgstr ""
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
msgstr ""
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr ""
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
msgstr ""
@@ -1450,122 +1455,123 @@ msgstr ""
msgid "Adjust the red map"
msgstr ""
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
msgid "Red Density"
msgstr ""
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
msgstr ""
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
msgid "Blue Density"
msgstr ""
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
msgstr ""
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
msgstr ""
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
msgstr ""
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr ""
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
msgid "Print To Hub"
msgstr ""
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
msgid "Manual Control"
msgstr ""
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
msgstr ""
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr ""
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
msgstr ""
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr ""
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1725,8 +1731,8 @@ msgstr ""
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -1842,23 +1848,23 @@ msgstr ""
msgid "2400x600 DPI"
msgstr ""
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
msgid "PPDFile"
msgstr ""
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
msgid "PPD File"
msgstr ""
@@ -5402,51 +5408,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -5932,7 +5938,7 @@ msgstr ""
msgid "Dimensions:"
msgstr ""
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr ""
@@ -5941,7 +5947,7 @@ msgstr ""
msgid "Width of the paper that you wish to print to"
msgstr ""
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr ""
@@ -6185,136 +6191,136 @@ msgid ""
"wish to print to"
msgstr ""
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr ""
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr ""
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr ""
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr ""
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
msgstr ""
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr ""
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr ""
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr ""
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr ""
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr ""
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr ""
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr ""
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
msgstr ""
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr ""
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr ""
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr ""
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr ""
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr ""
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr ""
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr ""
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr ""
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr ""
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
msgstr ""
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
msgstr ""
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr ""
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr ""
@@ -6431,28 +6437,27 @@ msgstr ""
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-msgid "Gutenprint"
-msgstr ""
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr ""
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr ""
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -6642,26 +6647,30 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr ""
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr ""
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr ""
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
"Cannot write to %s: %s\n"
msgstr ""
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -6669,224 +6678,224 @@ msgid ""
"Please use -m to specify your printer model.\n"
msgstr ""
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, c-format
msgid "Status: Waiting\n"
msgstr ""
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, c-format
msgid "Error: Ink out\n"
msgstr ""
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, c-format
msgid "Error: Paper out\n"
msgstr ""
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr ""
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, c-format
msgid "Cannot identify printer model.\n"
msgstr ""
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr ""
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -6925,7 +6934,7 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -6961,17 +6970,17 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr ""
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -6983,38 +6992,38 @@ msgid ""
"What do you want to do (s, q, r)?\n"
msgstr ""
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr ""
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
"If you wish to save the alignment, you must repeat this process.\n"
msgstr ""
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr ""
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr ""
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7024,44 +7033,44 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr ""
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr ""
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr ""
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr ""
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr ""
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7072,12 +7081,12 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr ""
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7085,42 +7094,42 @@ msgid ""
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr ""
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr ""
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr ""
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr ""
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr ""
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr ""
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr ""
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7129,7 +7138,7 @@ msgid ""
"quality printing.\n"
msgstr ""
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr ""
@@ -7138,7 +7147,7 @@ msgstr ""
msgid "Printing..."
msgstr ""
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr ""
@@ -7154,108 +7163,108 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index 43a8e86..eeaa038 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
Binary files differ
diff --git a/po/hu.po b/po/hu.po
index 583c7b1..bac0e23 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,25 +1,27 @@
# Hungarian translation of gutenprint.
# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+#
# Laszlo Dvornik <dvornikl@mailbox.hu>, 2004.
# Andras Timar <timar@fsf.hu>, 2004.
# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006.
-#
msgid ""
msgstr ""
-"Project-Id-Version: gutenprint 5.0.0-b5\n"
+"Project-Id-Version: gutenprint 5.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
-"PO-Revision-Date: 2006-01-22 15:47+0100\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"PO-Revision-Date: 2006-06-16 16:40+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
msgstr "Alapértelmezett"
@@ -31,66 +33,69 @@ msgstr "Egyenletes tónus (EvenTone)"
msgid "Hybrid EvenTone"
msgstr "Hibrid egyenletes tónus (EvenTone)"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
msgstr "Mégjobb"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
msgstr "Hibrid Mégjobb"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
msgid "UniTone"
msgstr "UniTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr "Hibrid UniTone"
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptív hibrid"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Rendezett"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Gyors"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Nagyon gyors"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Floyd-Steinberg hibrid"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr "Előszórt bemenet"
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
msgstr "Sűrűség"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr "Kimeneti szint igazítása"
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -100,15 +105,15 @@ msgstr ""
"papíron vagy elfolyik, akkor csökkentse a sűrűséget. Ha a fekete területek "
"nem egyenletesek, akkor viszont növelje azt."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Szórási algoritmus"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr "Képernyőzési igazítás"
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -275,9 +280,8 @@ msgid "Plain Paper"
msgstr "Egyszerű lap"
#: src/main/print-canon.c:1448
-#, fuzzy
msgid "Plain Paper PIXMA"
-msgstr "Egyszerű lap"
+msgstr "Egyszerű PIXMA lap"
#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
@@ -332,7 +336,7 @@ msgstr "Egyéb"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
msgstr "Oldalméret"
@@ -347,58 +351,58 @@ msgstr "Oldalméret"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
msgstr "Nyomtató alapbeállításai"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
msgstr "A nyomtatáshoz használt papír mérete"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Papír típusa"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr "A hordozó típusa (egyszerű lap, fotópapír, stb.)"
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Papír forrása"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr "A nyomtatáshoz használt hordozó forrása"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Felbontás"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "A nyomtatás felbontása és minősége"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Tinta típusa"
@@ -406,22 +410,22 @@ msgstr "Tinta típusa"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr "Haladó nyomtatóbeállítások"
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "A nyomtatóban levő tinta típusa"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr "Tintacsatornák"
@@ -431,13 +435,13 @@ msgstr "Tintacsatornák"
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr "Haladó nyomtatófunkciók"
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
msgstr "Nyomtatási mód"
@@ -445,87 +449,87 @@ msgstr "Nyomtatási mód"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
msgstr "Alap paraméter"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr "Nyomtatás kimeneti módja"
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr "Kétoldalas nyomtatás"
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr "Kétoldalas/fordítva beállítás"
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
msgid "Cyan Density"
msgstr "Ciánkék sűrűsége"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
msgstr "A nyomat ciánkék-sűrűségének beállítása"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
msgid "Magenta Density"
msgstr "Bíborvörös sűrűsége"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
msgstr "A nyomat bíborvörös-sűrűségének beállítása"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
msgid "Yellow Density"
msgstr "Sárga sűrűsége"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
msgstr "A nyomat sárga-sűrűségének beállítása"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
msgid "Black Density"
msgstr "Fekete sűrűsége"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
msgstr "A nyomat fekete-sűrűségének beállítása"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
msgstr "Világos ciánkék átmenet"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr "Haladó tintabeállítás"
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
msgstr "Világos bíborvörös átmenet"
@@ -533,13 +537,13 @@ msgstr "Világos bíborvörös átmenet"
msgid "Light Yellow Transition"
msgstr "Világossárga átmenet"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr "Kikapcsolva"
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr "Rövidebbik él (tükrözve)"
@@ -556,13 +560,12 @@ msgid "Manual without Pause"
msgstr "Kézzel szünetek nélkül"
#: src/main/print-canon.c:1923
-#, fuzzy
msgid "Cassette"
-msgstr "Matt"
+msgstr "Kazetta"
#: src/main/print-canon.c:1924
msgid "CD tray"
-msgstr ""
+msgstr "CD tálca"
#: src/main/print-canon.c:2049
msgid "Photo CcMmYK Color"
@@ -581,28 +584,28 @@ msgid "CMY Color"
msgstr "CMY szín"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Fekete"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Színes"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr "Fekete-fehér"
@@ -729,13 +732,12 @@ msgid "Raw Channels"
msgstr "Nyers csatornák"
#: src/main/print-color.c:216
-#, fuzzy
msgid "SimpleGamma"
-msgstr "Alkalmazás Gamma"
+msgstr "SimpleGamma"
#: src/main/print-color.c:217
msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "Ne legyen képernyő-gammakorrekció"
#: src/main/print-color.c:224
msgid "Brightness"
@@ -785,15 +787,15 @@ msgstr "Alkalmazás Gamma"
msgid "Gamma value assumed by application"
msgstr "Az alkalmazás által feltételezett gamma érték"
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Ciánkék"
@@ -801,15 +803,15 @@ msgstr "Ciánkék"
msgid "Adjust the cyan gamma"
msgstr "A ciánkék gamma értékének beállítása"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Bíborvörös"
@@ -817,15 +819,15 @@ msgstr "Bíborvörös"
msgid "Adjust the magenta gamma"
msgstr "A bíborvörös gamma értékének beállítása"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Sárga"
@@ -833,10 +835,10 @@ msgstr "Sárga"
msgid "Adjust the yellow gamma"
msgstr "A sárga gamma értékének beállítása"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr "Vörös"
@@ -844,7 +846,7 @@ msgstr "Vörös"
msgid "Adjust the red gamma"
msgstr "A vörös gamma értékének beállítása"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr "Zöld"
@@ -853,10 +855,10 @@ msgstr "Zöld"
msgid "Adjust the green gamma"
msgstr "A zöld gamma értékének beállítása"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr "Kék"
@@ -1159,162 +1161,157 @@ msgstr ""
"A kép túl magas az oldalhoz: a felső margó %d, a magasság %d, az alsó szél %"
"d\n"
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Szabványos"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Tekercses adagoló"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr "Tekercses adagoló (levágás minden lap után)"
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr "Tekercses adagoló (levágás nélkül)"
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
msgstr "Kézi adagolás"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
msgstr "Nyomtatás CD-re"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
-#, fuzzy
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
msgid "Manual Sheet Guide"
-msgstr "Kézi kijelölés"
+msgstr "Kézi lapvezérlő"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
-#, fuzzy
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
msgid "Manual Feed (Front)"
-msgstr "Kézi adagolás"
+msgstr "Kézi adagolás (elöl)"
-#: src/main/print-escp2-data.c:553
-#, fuzzy
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
-msgstr "Tálca"
+msgstr "Hátsó tálca"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
-msgstr ""
+msgstr "Első tálca"
-#: src/main/print-escp2-data.c:580
-#, fuzzy
+#: src/main/print-escp2-data.c:581
msgid "Photo Board"
-msgstr "Fotófekete"
+msgstr "Fotókarton"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr "Vágólap, 1. tálca"
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr "Vágólap, 2. tálca"
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr "Vágólap, automatikus tálcaválasztás"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr "Kézi kijelölés"
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr "Gyors, gazdaságos"
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr "Gazdaságos"
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr "Piszkozat"
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
msgstr "Magas"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
msgstr "Fotó"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
msgid "Super Photo"
msgstr "Szuper fotó"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
msgid "Ultra Photo"
msgstr "Ultra fotó"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr "Legjobb"
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr "Világos ciánkék"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
msgstr "Világos bíborvörös"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
msgstr "Világos fekete"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
msgstr "Sötétsárga"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
msgstr "Matt fekete"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
msgstr "Fotófekete"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr "Fényességoptimalizáló"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
-#, fuzzy
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
-msgstr "Világos fekete"
+msgstr "Világosszürke"
#: src/main/print-escp2.c:159
msgid "Automatic Printing Mode"
@@ -1483,122 +1480,123 @@ msgstr "Vörös-leképezés"
msgid "Adjust the red map"
msgstr "A vörös-leképezés beállítása"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
msgid "Red Density"
msgstr "Vörös sűrűsége"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
msgstr "A vörös sűrűségének beállítása"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
msgid "Blue Density"
msgstr "Kék sűrűsége"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
msgstr "A kék sűrűségének beállítása"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
msgstr "Fényesség szintje"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
msgstr "A fényesség szintjének beállítása"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr "Sötétsárga átmenet"
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr "Szürkeátmenet"
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
msgstr "Világosszürke-átmenet"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
msgstr "Sötétszürke-átmenet"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
msgstr "Középsőszürke-átmenet"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
msgstr "Közepesszürke-átmenet"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr "Teljesen kézi vezérlés"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr "Automatikus beállításvezérlés"
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr "5 hüvelykes CD"
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr "3 hüvelykes CD"
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr "Normál"
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
msgid "Print To Hub"
msgstr "Nyomtatás a középpontig"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
msgid "Manual Control"
msgstr "Kézi vezérlés"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
msgstr "Automatikus"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr "Kétirányú"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
msgstr "Egyirányú"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr "Alternatív kitöltés"
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr "Növekvő kitöltés"
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr "Csökkenő kitöltés"
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr "Növekvő dupla"
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr "Legközelebbi szomszéd elkerülése"
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Ez a nyomtató nem támogatja a nyers kimenetet a(z) %d mélységben\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr "A nyomtatási beállítások nincsenek ellenőrizve, nem lehet nyomtatni.\n"
@@ -1758,8 +1756,8 @@ msgstr "Ilford-féle nehéz papír"
msgid "Coated"
msgstr "Bevont"
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr "Nincs"
@@ -1875,23 +1873,23 @@ msgstr "600x600 DPI fekete-fehér"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Színes + fekete patron"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Színes + fotó patronok"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr "hosszabbik él (szabvány)"
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
msgid "PPDFile"
msgstr "PPD fájl"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
msgid "PPD File"
msgstr "PPD fájl"
@@ -1905,9 +1903,8 @@ msgid "Two Level Grayscale"
msgstr "Kétszintű szürkeárnyalatos"
#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
-#, fuzzy
msgid "Three Level Grayscale"
-msgstr "Kétszintű szürkeárnyalatos"
+msgstr "Háromszintű szürkeárnyalatos"
#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
@@ -1931,9 +1928,8 @@ msgid "Seven Color Enhanced"
msgstr "Hétszínes (továbbfejlesztett)"
#: src/main/escp2-channels.c:1535
-#, fuzzy
msgid "Eight Color Photo"
-msgstr "Hatszínes fénykép"
+msgstr "Nyolcszínes fénykép"
#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
msgid "One Color Raw"
@@ -1992,9 +1988,8 @@ msgid "Seven Color Enhanced Gloss Raw"
msgstr "Hétszínes továbbfejlesztett, fényes nyers"
#: src/main/escp2-channels.c:2042
-#, fuzzy
msgid "Eight Color Raw"
-msgstr "Hatszínes nyers"
+msgstr "Nyolcszínes nyers"
#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
@@ -2004,7 +1999,7 @@ msgstr "Hatszínes nyers"
#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
msgid "EPSON Standard Inks"
-msgstr "EPSON szabvány tinták"
+msgstr "Epson szabvány tinták"
#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
msgid "UltraChrome Photo Black"
@@ -2107,9 +2102,8 @@ msgid "720 DPI Highest Quality"
msgstr "720 DPI Legjobb minőségű"
#: src/main/escp2-resolutions.c:100
-#, fuzzy
msgid "720 x 720 DPI"
-msgstr "720x720 DPI"
+msgstr "720 x 720 DPI"
#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
#: src/main/escp2-resolutions.c:119
@@ -2121,9 +2115,8 @@ msgid "1440 x 720 DPI Highest Quality"
msgstr "1440 x 720 DPI Legjobb minőségű"
#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
-#, fuzzy
msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgstr "1440 x 720 DPI felcserélt"
#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
msgid "2880 x 720 DPI"
@@ -2139,19 +2132,16 @@ msgid "1440 x 1440 DPI"
msgstr "1440 x 1440 DPI"
#: src/main/escp2-resolutions.c:142
-#, fuzzy
msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
+msgstr "1440 x 1440"
#: src/main/escp2-resolutions.c:145
-#, fuzzy
msgid "1440 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI Legjobb minőségű"
+msgstr "1440 x 1440 DPI Jó minőségű"
#: src/main/escp2-resolutions.c:148
-#, fuzzy
msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 720 DPI Legjobb minőségű"
+msgstr "1440 x 1440 DPI Legjobb minőségű"
#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
#: src/main/escp2-resolutions.c:161
@@ -2159,33 +2149,28 @@ msgid "2880 x 1440 DPI"
msgstr "2880 x 1440 DPI"
#: src/main/escp2-resolutions.c:158
-#, fuzzy
msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 DPI"
+msgstr "2880 x 1440 DPI felcserélt"
#: src/main/escp2-resolutions.c:164
-#, fuzzy
msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI Legjobb minőségű"
+msgstr "2880 x 720 DPI Jó minőségű"
#: src/main/escp2-resolutions.c:167
-#, fuzzy
msgid "2880 x 1440 DPI Highest Quality"
msgstr "2880 x 720 DPI Legjobb minőségű"
#: src/main/escp2-resolutions.c:171
-#, fuzzy
msgid "5760 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
msgid "2880 x 2880 DPI"
msgstr "2880 x 2880 DPI"
#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
-#, fuzzy
msgid "5760 x 2880 DPI"
-msgstr "2880 x 2880 DPI"
+msgstr "5760 x 2880 DPI"
#: src/main/escp2-resolutions.c:548
msgid "On"
@@ -2296,9 +2281,8 @@ msgid "4x6"
msgstr "4x6"
#: src/main/xmli18n-tmp.h:10
-#, fuzzy
msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Epson 4x6-os fotópapír"
+msgstr "Epson 4x6-os fotópapír (letéphető szegélyek)"
#: src/main/xmli18n-tmp.h:11
msgid "5x7"
@@ -2778,15 +2762,15 @@ msgstr "Széles levelezőlap"
#: src/main/xmli18n-tmp.h:131
msgid "Chilean Office"
-msgstr ""
+msgstr "Chilei Office"
#: src/main/xmli18n-tmp.h:132
msgid "Chilean Double Letter"
-msgstr ""
+msgstr "Chilei dupla levél"
#: src/main/xmli18n-tmp.h:133
msgid "Chilean Double Office"
-msgstr ""
+msgstr "Chilei dupla Office"
#: src/main/xmli18n-tmp.h:134
msgid "Custom"
@@ -2837,139 +2821,112 @@ msgid "PostScript Level 2"
msgstr "2. szintű PostScript"
#: src/main/xmli18n-tmp.h:146
-#, fuzzy
msgid "Canon BJ-30"
-msgstr "Canon BJC 30"
+msgstr "Canon BJ-30"
#: src/main/xmli18n-tmp.h:147
-#, fuzzy
msgid "Canon BJC-50"
-msgstr "Canon BJC 50"
+msgstr "Canon BJC-50"
#: src/main/xmli18n-tmp.h:148
-#, fuzzy
msgid "Canon BJC-55"
-msgstr "Canon BJC 55"
+msgstr "Canon BJC-55"
#: src/main/xmli18n-tmp.h:149
-#, fuzzy
msgid "Canon BJC-80"
-msgstr "Canon BJC 80"
+msgstr "Canon BJC-80"
#: src/main/xmli18n-tmp.h:150
-#, fuzzy
msgid "Canon BJC-85"
-msgstr "Canon BJC 85"
+msgstr "Canon BJC-85"
#: src/main/xmli18n-tmp.h:151
-#, fuzzy
msgid "Canon BJC-210"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-210"
#: src/main/xmli18n-tmp.h:152
-#, fuzzy
msgid "Canon BJC-240"
-msgstr "Canon BJC 240"
+msgstr "Canon BJC-240"
#: src/main/xmli18n-tmp.h:153
-#, fuzzy
msgid "Canon BJC-250"
-msgstr "Canon BJC 250"
+msgstr "Canon BJC-250"
#: src/main/xmli18n-tmp.h:154
-#, fuzzy
msgid "Canon BJC-1000"
-msgstr "Canon BJC 1000"
+msgstr "Canon BJC-1000"
#: src/main/xmli18n-tmp.h:155
-#, fuzzy
msgid "Canon BJC-2000"
-msgstr "Canon BJC 2000"
+msgstr "Canon BJC-2000"
#: src/main/xmli18n-tmp.h:156
-#, fuzzy
msgid "Canon BJC-2010"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2010"
#: src/main/xmli18n-tmp.h:157
-#, fuzzy
msgid "Canon BJC-2100"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2100"
#: src/main/xmli18n-tmp.h:158
-#, fuzzy
msgid "Canon BJC-2110"
-msgstr "Canon BJC 210"
+msgstr "Canon BJC-2110"
#: src/main/xmli18n-tmp.h:159
-#, fuzzy
msgid "Canon BJC-3000"
-msgstr "Canon BJC 3000"
+msgstr "Canon BJC-3000"
#: src/main/xmli18n-tmp.h:160
-#, fuzzy
msgid "Canon BJC-4000"
-msgstr "Canon BJC 7000"
+msgstr "Canon BJC-4000"
#: src/main/xmli18n-tmp.h:161
-#, fuzzy
msgid "Canon BJC-4300"
-msgstr "Canon BJC 4300"
+msgstr "Canon BJC-4300"
#: src/main/xmli18n-tmp.h:162
-#, fuzzy
msgid "Canon BJC-4400"
-msgstr "Canon BJC 4300"
+msgstr "Canon BJC-4400"
#: src/main/xmli18n-tmp.h:163
-#, fuzzy
msgid "Canon BJC-6000"
-msgstr "Canon BJC 6000"
+msgstr "Canon BJC-6000"
#: src/main/xmli18n-tmp.h:164
-#, fuzzy
msgid "Canon BJC-6100"
-msgstr "Canon BJC 6100"
+msgstr "Canon BJC-6100"
#: src/main/xmli18n-tmp.h:165
-#, fuzzy
msgid "Canon BJC-6200"
-msgstr "Canon BJC 6200"
+msgstr "Canon BJC-6200"
#: src/main/xmli18n-tmp.h:166
-#, fuzzy
msgid "Canon BJC-6500"
-msgstr "Canon BJC 6500"
+msgstr "Canon BJC-6500"
#: src/main/xmli18n-tmp.h:167
-#, fuzzy
msgid "Canon BJC-7000"
-msgstr "Canon BJC 7000"
+msgstr "Canon BJC-7000"
#: src/main/xmli18n-tmp.h:168
-#, fuzzy
msgid "Canon BJC-7100"
-msgstr "Canon BJC 7100"
+msgstr "Canon BJC-7100"
#: src/main/xmli18n-tmp.h:169
-#, fuzzy
msgid "Canon BJC-8200"
-msgstr "Canon BJC 8200"
+msgstr "Canon BJC-8200"
#: src/main/xmli18n-tmp.h:170
-#, fuzzy
msgid "Canon S100"
-msgstr "Canon S400"
+msgstr "Canon S100"
#: src/main/xmli18n-tmp.h:171
-#, fuzzy
msgid "Canon S200"
-msgstr "Canon S400"
+msgstr "Canon S200"
#: src/main/xmli18n-tmp.h:172
-#, fuzzy
msgid "Canon S300"
-msgstr "Canon S400"
+msgstr "Canon S300"
#: src/main/xmli18n-tmp.h:173
msgid "Canon S400"
@@ -2980,19 +2937,16 @@ msgid "Canon S450"
msgstr "Canon S450"
#: src/main/xmli18n-tmp.h:175
-#, fuzzy
msgid "Canon S500"
-msgstr "Canon S4500"
+msgstr "Canon S500"
#: src/main/xmli18n-tmp.h:176
-#, fuzzy
msgid "Canon S600"
-msgstr "Canon S400"
+msgstr "Canon S600"
#: src/main/xmli18n-tmp.h:177
-#, fuzzy
msgid "Canon S630"
-msgstr "Canon S400"
+msgstr "Canon S630"
#: src/main/xmli18n-tmp.h:178
msgid "Canon S800"
@@ -3003,1223 +2957,1000 @@ msgid "Canon S4500"
msgstr "Canon S4500"
#: src/main/xmli18n-tmp.h:180
-#, fuzzy
msgid "Canon iP4000"
-msgstr "Canon S400"
+msgstr "Canon iP4000"
#: src/main/xmli18n-tmp.h:181
-#, fuzzy
msgid "Epson Stylus C20"
-msgstr "EPSON Stylus C20SX"
+msgstr "Epson Stylus C20"
#: src/main/xmli18n-tmp.h:182
-#, fuzzy
msgid "Epson Stylus C20SX"
-msgstr "EPSON Stylus C20SX"
+msgstr "Epson Stylus C20SX"
#: src/main/xmli18n-tmp.h:183
-#, fuzzy
msgid "Epson Stylus C20UX"
-msgstr "EPSON Stylus C20UX"
+msgstr "Epson Stylus C20UX"
#: src/main/xmli18n-tmp.h:184
-#, fuzzy
msgid "Epson Stylus C40"
-msgstr "EPSON Stylus C40SX"
+msgstr "Epson Stylus C40"
#: src/main/xmli18n-tmp.h:185
-#, fuzzy
msgid "Epson Stylus C40SX"
-msgstr "EPSON Stylus C40SX"
+msgstr "Epson Stylus C40SX"
#: src/main/xmli18n-tmp.h:186
-#, fuzzy
msgid "Epson Stylus C40UX"
-msgstr "EPSON Stylus C40UX"
+msgstr "Epson Stylus C40UX"
#: src/main/xmli18n-tmp.h:187
-#, fuzzy
msgid "Epson Stylus C41"
-msgstr "EPSON Stylus C41SX"
+msgstr "Epson Stylus C41"
#: src/main/xmli18n-tmp.h:188
-#, fuzzy
msgid "Epson Stylus C41SX"
-msgstr "EPSON Stylus C41SX"
+msgstr "Epson Stylus C41SX"
#: src/main/xmli18n-tmp.h:189
-#, fuzzy
msgid "Epson Stylus C41UX"
-msgstr "EPSON Stylus C41UX"
+msgstr "Epson Stylus C41UX"
#: src/main/xmli18n-tmp.h:190
-#, fuzzy
msgid "Epson Stylus C42"
-msgstr "EPSON Stylus C42SX"
+msgstr "Epson Stylus C42"
#: src/main/xmli18n-tmp.h:191
-#, fuzzy
msgid "Epson Stylus C42SX"
-msgstr "EPSON Stylus C42SX"
+msgstr "Epson Stylus C42SX"
#: src/main/xmli18n-tmp.h:192
-#, fuzzy
msgid "Epson Stylus C42UX"
-msgstr "EPSON Stylus C42UX"
+msgstr "Epson Stylus C42UX"
#: src/main/xmli18n-tmp.h:193
-#, fuzzy
msgid "Epson Stylus C43"
-msgstr "EPSON Stylus C43SX"
+msgstr "Epson Stylus C43"
#: src/main/xmli18n-tmp.h:194
-#, fuzzy
msgid "Epson Stylus C43SX"
-msgstr "EPSON Stylus C43SX"
+msgstr "Epson Stylus C43SX"
#: src/main/xmli18n-tmp.h:195
-#, fuzzy
msgid "Epson Stylus C43UX"
-msgstr "EPSON Stylus C43UX"
+msgstr "Epson Stylus C43UX"
#: src/main/xmli18n-tmp.h:196
-#, fuzzy
msgid "Epson Stylus C44"
-msgstr "EPSON Stylus C44SX"
+msgstr "Epson Stylus C44"
#: src/main/xmli18n-tmp.h:197
-#, fuzzy
msgid "Epson Stylus C44SX"
-msgstr "EPSON Stylus C44SX"
+msgstr "Epson Stylus C44SX"
#: src/main/xmli18n-tmp.h:198
-#, fuzzy
msgid "Epson Stylus C44UX"
-msgstr "EPSON Stylus C44UX"
+msgstr "Epson Stylus C44UX"
#: src/main/xmli18n-tmp.h:199
-#, fuzzy
msgid "Epson Stylus C45"
-msgstr "EPSON Stylus C45"
+msgstr "Epson Stylus C45"
#: src/main/xmli18n-tmp.h:200
-#, fuzzy
msgid "Epson Stylus C46"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus C46"
#: src/main/xmli18n-tmp.h:201
-#, fuzzy
msgid "Epson Stylus C48"
-msgstr "EPSON Stylus C45"
+msgstr "Epson Stylus C48"
#: src/main/xmli18n-tmp.h:202
-#, fuzzy
msgid "Epson Stylus C50"
-msgstr "EPSON Stylus C50"
+msgstr "Epson Stylus C50"
#: src/main/xmli18n-tmp.h:203
-#, fuzzy
msgid "Epson Stylus C60"
-msgstr "EPSON Stylus C60"
+msgstr "Epson Stylus C60"
#: src/main/xmli18n-tmp.h:204
-#, fuzzy
msgid "Epson Stylus C61"
-msgstr "EPSON Stylus C61"
+msgstr "Epson Stylus C61"
#: src/main/xmli18n-tmp.h:205
-#, fuzzy
msgid "Epson Stylus C62"
-msgstr "EPSON Stylus C62"
+msgstr "Epson Stylus C62"
#: src/main/xmli18n-tmp.h:206
-#, fuzzy
msgid "Epson Stylus C63"
-msgstr "EPSON Stylus C63"
+msgstr "Epson Stylus C63"
#: src/main/xmli18n-tmp.h:207
-#, fuzzy
msgid "Epson Stylus C64"
-msgstr "EPSON Stylus C64"
+msgstr "Epson Stylus C64"
#: src/main/xmli18n-tmp.h:208
-#, fuzzy
msgid "Epson Stylus C65"
-msgstr "EPSON Stylus C65"
+msgstr "Epson Stylus C65"
#: src/main/xmli18n-tmp.h:209
-#, fuzzy
msgid "Epson Stylus C66"
-msgstr "EPSON Stylus C66"
+msgstr "Epson Stylus C66"
#: src/main/xmli18n-tmp.h:210
-#, fuzzy
msgid "Epson Stylus C68"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus C68"
#: src/main/xmli18n-tmp.h:211
-#, fuzzy
msgid "Epson Stylus C70"
-msgstr "EPSON Stylus C70"
+msgstr "Epson Stylus C70"
#: src/main/xmli18n-tmp.h:212
-#, fuzzy
msgid "Epson Stylus C80"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus C80"
#: src/main/xmli18n-tmp.h:213
-#, fuzzy
msgid "Epson Stylus C82"
-msgstr "EPSON Stylus C82"
+msgstr "Epson Stylus C82"
#: src/main/xmli18n-tmp.h:214
-#, fuzzy
msgid "Epson Stylus C83"
-msgstr "EPSON Stylus C83"
+msgstr "Epson Stylus C83"
#: src/main/xmli18n-tmp.h:215
-#, fuzzy
msgid "Epson Stylus C84"
-msgstr "EPSON Stylus C84"
+msgstr "Epson Stylus C84"
#: src/main/xmli18n-tmp.h:216
-#, fuzzy
msgid "Epson Stylus C85"
-msgstr "EPSON Stylus C85"
+msgstr "Epson Stylus C85"
#: src/main/xmli18n-tmp.h:217
-#, fuzzy
msgid "Epson Stylus C86"
-msgstr "EPSON Stylus C86"
+msgstr "Epson Stylus C86"
#: src/main/xmli18n-tmp.h:218
-#, fuzzy
msgid "Epson Stylus C88"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus C88"
#: src/main/xmli18n-tmp.h:219
-#, fuzzy
msgid "Epson Stylus Color"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color"
#: src/main/xmli18n-tmp.h:220
-#, fuzzy
msgid "Epson Stylus Color I"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color I"
#: src/main/xmli18n-tmp.h:221
-#, fuzzy
msgid "Epson Stylus Color II"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color II"
#: src/main/xmli18n-tmp.h:222
-#, fuzzy
msgid "Epson Stylus Color IIs"
-msgstr "EPSON Stylus Color"
+msgstr "Epson Stylus Color IIs"
#: src/main/xmli18n-tmp.h:223
-#, fuzzy
msgid "Epson Stylus Color PRO"
-msgstr "EPSON Stylus Color Pro"
+msgstr "Epson Stylus Color PRO"
#: src/main/xmli18n-tmp.h:224
-#, fuzzy
msgid "Epson Stylus Pro XL"
-msgstr "EPSON Stylus Color Pro XL"
+msgstr "Epson Stylus Pro XL"
#: src/main/xmli18n-tmp.h:225
-#, fuzzy
msgid "Epson Stylus Color 400"
-msgstr "EPSON Stylus Color 400"
+msgstr "Epson Stylus Color 400"
#: src/main/xmli18n-tmp.h:226
-#, fuzzy
msgid "Epson Stylus Color 440"
-msgstr "EPSON Stylus Color 440"
+msgstr "Epson Stylus Color 440"
#: src/main/xmli18n-tmp.h:227
-#, fuzzy
msgid "Epson Stylus Color 460"
-msgstr "EPSON Stylus Color 460"
+msgstr "Epson Stylus Color 460"
#: src/main/xmli18n-tmp.h:228
-#, fuzzy
msgid "Epson Stylus Color 480"
-msgstr "EPSON Stylus Color 480"
+msgstr "Epson Stylus Color 480"
#: src/main/xmli18n-tmp.h:229
-#, fuzzy
msgid "Epson Stylus Color 500"
-msgstr "EPSON Stylus Color 500"
+msgstr "Epson Stylus Color 500"
#: src/main/xmli18n-tmp.h:230
-#, fuzzy
msgid "Epson Stylus Color 580"
-msgstr "EPSON Stylus Color 580"
+msgstr "Epson Stylus Color 580"
#: src/main/xmli18n-tmp.h:231
-#, fuzzy
msgid "Epson Stylus Color 600"
-msgstr "EPSON Stylus Color 600"
+msgstr "Epson Stylus Color 600"
#: src/main/xmli18n-tmp.h:232
-#, fuzzy
msgid "Epson Stylus Color 640"
-msgstr "EPSON Stylus Color 640"
+msgstr "Epson Stylus Color 640"
#: src/main/xmli18n-tmp.h:233
-#, fuzzy
msgid "Epson Stylus Color 660"
-msgstr "EPSON Stylus Color 660"
+msgstr "Epson Stylus Color 660"
#: src/main/xmli18n-tmp.h:234
-#, fuzzy
msgid "Epson Stylus Color 670"
-msgstr "EPSON Stylus Color 670"
+msgstr "Epson Stylus Color 670"
#: src/main/xmli18n-tmp.h:235
-#, fuzzy
msgid "Epson Stylus Color 680"
-msgstr "EPSON Stylus Color 680"
+msgstr "Epson Stylus Color 680"
#: src/main/xmli18n-tmp.h:236
-#, fuzzy
msgid "Epson Stylus Color 740"
-msgstr "EPSON Stylus Color 740"
+msgstr "Epson Stylus Color 740"
#: src/main/xmli18n-tmp.h:237
-#, fuzzy
msgid "Epson Stylus Color 760"
-msgstr "EPSON Stylus Color 760"
+msgstr "Epson Stylus Color 760"
#: src/main/xmli18n-tmp.h:238
-#, fuzzy
msgid "Epson Stylus Color 777"
-msgstr "EPSON Stylus Color 777"
+msgstr "Epson Stylus Color 777"
#: src/main/xmli18n-tmp.h:239
-#, fuzzy
msgid "Epson Stylus Color 800"
-msgstr "EPSON Stylus Color 800"
+msgstr "Epson Stylus Color 800"
#: src/main/xmli18n-tmp.h:240
-#, fuzzy
msgid "Epson Stylus Color 850"
-msgstr "EPSON Stylus Color 850"
+msgstr "Epson Stylus Color 850"
#: src/main/xmli18n-tmp.h:241
-#, fuzzy
msgid "Epson Stylus Color 860"
-msgstr "EPSON Stylus Color 860"
+msgstr "Epson Stylus Color 860"
#: src/main/xmli18n-tmp.h:242
-#, fuzzy
msgid "Epson Stylus Color 880"
-msgstr "EPSON Stylus Color 880"
+msgstr "Epson Stylus Color 880"
#: src/main/xmli18n-tmp.h:243
-#, fuzzy
msgid "Epson Stylus Color 8 3"
-msgstr "EPSON Stylus Color 83"
+msgstr "Epson Stylus Color 8 3"
#: src/main/xmli18n-tmp.h:244
-#, fuzzy
msgid "Epson Stylus Color 900"
-msgstr "EPSON Stylus Color 900"
+msgstr "Epson Stylus Color 900"
#: src/main/xmli18n-tmp.h:245
-#, fuzzy
msgid "Epson Stylus Color 980"
-msgstr "EPSON Stylus Color 980"
+msgstr "Epson Stylus Color 980"
#: src/main/xmli18n-tmp.h:246
-#, fuzzy
msgid "Epson Stylus Color 1160"
-msgstr "EPSON Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
#: src/main/xmli18n-tmp.h:247
-#, fuzzy
msgid "Epson Stylus Color 1500"
-msgstr "EPSON Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
#: src/main/xmli18n-tmp.h:248
-#, fuzzy
msgid "Epson Stylus Color 1520"
-msgstr "EPSON Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
#: src/main/xmli18n-tmp.h:249
-#, fuzzy
msgid "Epson Stylus Color 3000"
-msgstr "EPSON Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
#: src/main/xmli18n-tmp.h:250
-#, fuzzy
msgid "Epson Stylus Photo"
-msgstr "EPSON Stylus Photo"
+msgstr "Epson Stylus Photo"
#: src/main/xmli18n-tmp.h:251
-#, fuzzy
msgid "Epson Stylus Photo 700"
-msgstr "EPSON Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
#: src/main/xmli18n-tmp.h:252
-#, fuzzy
msgid "Epson Stylus Photo EX"
-msgstr "EPSON Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
#: src/main/xmli18n-tmp.h:253
-#, fuzzy
msgid "Epson Stylus Photo EX3"
-msgstr "EPSON Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
#: src/main/xmli18n-tmp.h:254
-#, fuzzy
msgid "Epson Stylus Photo 720"
-msgstr "EPSON Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
#: src/main/xmli18n-tmp.h:255
-#, fuzzy
msgid "Epson Stylus Photo 750"
-msgstr "EPSON Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
#: src/main/xmli18n-tmp.h:256
-#, fuzzy
msgid "Epson Stylus Photo 780"
-msgstr "EPSON Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
#: src/main/xmli18n-tmp.h:257
-#, fuzzy
msgid "Epson Stylus Photo 785"
-msgstr "EPSON Stylus Photo 895"
+msgstr "Epson Stylus Photo 785"
#: src/main/xmli18n-tmp.h:258
-#, fuzzy
msgid "Epson Stylus Photo 790"
-msgstr "EPSON Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
#: src/main/xmli18n-tmp.h:259
-#, fuzzy
msgid "Epson Stylus Photo 810"
-msgstr "EPSON Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
#: src/main/xmli18n-tmp.h:260
-#, fuzzy
msgid "Epson Stylus Photo 820"
-msgstr "EPSON Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
#: src/main/xmli18n-tmp.h:261
-#, fuzzy
msgid "Epson Stylus Photo 825"
-msgstr "EPSON Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
#: src/main/xmli18n-tmp.h:262
-#, fuzzy
msgid "Epson Stylus Photo 830"
-msgstr "EPSON Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
#: src/main/xmli18n-tmp.h:263
-#, fuzzy
msgid "Epson Stylus Photo 830U"
-msgstr "EPSON Stylus Photo 830"
+msgstr "Epson Stylus Photo 830U"
#: src/main/xmli18n-tmp.h:264
-#, fuzzy
msgid "Epson Stylus Photo 870"
-msgstr "EPSON Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
#: src/main/xmli18n-tmp.h:265
-#, fuzzy
msgid "Epson Stylus Photo 875"
-msgstr "EPSON Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
#: src/main/xmli18n-tmp.h:266
-#, fuzzy
msgid "Epson Stylus Photo 890"
-msgstr "EPSON Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
#: src/main/xmli18n-tmp.h:267
-#, fuzzy
msgid "Epson Stylus Photo 895"
-msgstr "EPSON Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
#: src/main/xmli18n-tmp.h:268
-#, fuzzy
msgid "Epson Stylus Photo 900"
-msgstr "EPSON Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
#: src/main/xmli18n-tmp.h:269
-#, fuzzy
msgid "Epson Stylus Photo 915"
-msgstr "EPSON Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
#: src/main/xmli18n-tmp.h:270
-#, fuzzy
msgid "Epson Stylus Photo 925"
-msgstr "EPSON Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
#: src/main/xmli18n-tmp.h:271
-#, fuzzy
msgid "Epson Stylus Photo 935"
-msgstr "EPSON Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
#: src/main/xmli18n-tmp.h:272
-#, fuzzy
msgid "Epson Stylus Photo 950"
-msgstr "EPSON Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
#: src/main/xmli18n-tmp.h:273
-#, fuzzy
msgid "Epson Stylus Photo 960"
-msgstr "EPSON Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
#: src/main/xmli18n-tmp.h:274
-#, fuzzy
msgid "Epson Stylus Photo 1200"
-msgstr "EPSON Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
#: src/main/xmli18n-tmp.h:275
-#, fuzzy
msgid "Epson Stylus Photo 1270"
-msgstr "EPSON Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
#: src/main/xmli18n-tmp.h:276
-#, fuzzy
msgid "Epson Stylus Photo 1280"
-msgstr "EPSON Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
#: src/main/xmli18n-tmp.h:277
-#, fuzzy
msgid "Epson Stylus Photo 1290"
-msgstr "EPSON Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
#: src/main/xmli18n-tmp.h:278
-#, fuzzy
msgid "Epson Stylus Photo 2000P"
-msgstr "EPSON Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
#: src/main/xmli18n-tmp.h:279
-#, fuzzy
msgid "Epson Stylus Photo 2100"
-msgstr "EPSON Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
#: src/main/xmli18n-tmp.h:280
-#, fuzzy
msgid "Epson Stylus Photo 2200"
-msgstr "EPSON Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
#: src/main/xmli18n-tmp.h:281
-#, fuzzy
msgid "Epson Stylus Photo R200"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
#: src/main/xmli18n-tmp.h:282
-#, fuzzy
msgid "Epson Stylus Photo R210"
-msgstr "EPSON Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
#: src/main/xmli18n-tmp.h:283
-#, fuzzy
msgid "Epson Stylus Photo R220"
-msgstr "EPSON Stylus Photo 2200"
+msgstr "Epson Stylus Photo R220"
#: src/main/xmli18n-tmp.h:284
-#, fuzzy
msgid "Epson Stylus Photo R300"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
#: src/main/xmli18n-tmp.h:285
-#, fuzzy
msgid "Epson Stylus Photo R310"
-msgstr "EPSON Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
#: src/main/xmli18n-tmp.h:286
-#, fuzzy
msgid "Epson Stylus Photo R320"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
#: src/main/xmli18n-tmp.h:287
-#, fuzzy
msgid "Epson Stylus Photo R340"
-msgstr "EPSON Stylus Photo R300"
+msgstr "Epson Stylus Photo R340"
#: src/main/xmli18n-tmp.h:288
-#, fuzzy
msgid "Epson Stylus Photo RX400"
-msgstr "EPSON Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
#: src/main/xmli18n-tmp.h:289
-#, fuzzy
msgid "Epson Stylus Photo RX420"
-msgstr "EPSON Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
#: src/main/xmli18n-tmp.h:290
-#, fuzzy
msgid "Epson Stylus Photo RX425"
-msgstr "EPSON Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
#: src/main/xmli18n-tmp.h:291
-#, fuzzy
msgid "Epson Stylus Photo RX430"
-msgstr "EPSON Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
#: src/main/xmli18n-tmp.h:292
-#, fuzzy
msgid "Epson Stylus Photo RX500"
-msgstr "EPSON Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
#: src/main/xmli18n-tmp.h:293
-#, fuzzy
msgid "Epson Stylus Photo RX510"
-msgstr "EPSON Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
#: src/main/xmli18n-tmp.h:294
-#, fuzzy
msgid "Epson Stylus Photo RX600"
-msgstr "EPSON Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
#: src/main/xmli18n-tmp.h:295
-#, fuzzy
msgid "Epson Stylus Photo RX620"
-msgstr "EPSON Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
#: src/main/xmli18n-tmp.h:296
-#, fuzzy
msgid "Epson Stylus Photo RX630"
-msgstr "EPSON Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
#: src/main/xmli18n-tmp.h:297
-#, fuzzy
msgid "Epson Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX700"
#: src/main/xmli18n-tmp.h:298
-#, fuzzy
msgid "Epson Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
#: src/main/xmli18n-tmp.h:299
-#, fuzzy
msgid "Epson Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
#: src/main/xmli18n-tmp.h:300
-#, fuzzy
msgid "Epson Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R200"
+msgstr "Epson Stylus Photo R2400"
#: src/main/xmli18n-tmp.h:301
-#, fuzzy
msgid "Epson Stylus Pro 5000"
-msgstr "EPSON Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
#: src/main/xmli18n-tmp.h:302
-#, fuzzy
msgid "Epson Stylus Pro 5500"
-msgstr "EPSON Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
#: src/main/xmli18n-tmp.h:303
-#, fuzzy
msgid "Epson Stylus Pro 7000"
-msgstr "EPSON Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
#: src/main/xmli18n-tmp.h:304
-#, fuzzy
msgid "Epson Stylus Pro 7500"
-msgstr "EPSON Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
#: src/main/xmli18n-tmp.h:305
-#, fuzzy
msgid "Epson Stylus Pro 7600"
-msgstr "EPSON Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
#: src/main/xmli18n-tmp.h:306
-#, fuzzy
msgid "Epson Stylus Pro 9000"
-msgstr "EPSON Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
#: src/main/xmli18n-tmp.h:307
-#, fuzzy
msgid "Epson Stylus Pro 9500"
-msgstr "EPSON Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
#: src/main/xmli18n-tmp.h:308
-#, fuzzy
msgid "Epson Stylus Pro 9600"
-msgstr "EPSON Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
#: src/main/xmli18n-tmp.h:309
-#, fuzzy
msgid "Epson Stylus Pro 10000"
-msgstr "EPSON Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
#: src/main/xmli18n-tmp.h:310
-#, fuzzy
msgid "Epson Stylus Scan 2000"
-msgstr "EPSON Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
#: src/main/xmli18n-tmp.h:311
-#, fuzzy
msgid "Epson Stylus Scan 2500"
-msgstr "EPSON Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
#: src/main/xmli18n-tmp.h:312
-#, fuzzy
msgid "Epson Stylus CX1500"
-msgstr "EPSON Stylus CX1500"
+msgstr "Epson Stylus CX1500"
#: src/main/xmli18n-tmp.h:313
-#, fuzzy
msgid "Epson Stylus CX3100"
-msgstr "EPSON Stylus CX3100"
+msgstr "Epson Stylus CX3100"
#: src/main/xmli18n-tmp.h:314
-#, fuzzy
msgid "Epson Stylus CX3200"
-msgstr "EPSON Stylus CX3200"
+msgstr "Epson Stylus CX3200"
#: src/main/xmli18n-tmp.h:315
-#, fuzzy
msgid "Epson Stylus CX3500"
-msgstr "EPSON Stylus CX3500"
+msgstr "Epson Stylus CX3500"
#: src/main/xmli18n-tmp.h:316
-#, fuzzy
msgid "Epson Stylus CX3600"
-msgstr "EPSON Stylus CX3600"
+msgstr "Epson Stylus CX3600"
#: src/main/xmli18n-tmp.h:317
-#, fuzzy
msgid "Epson Stylus CX3650"
-msgstr "EPSON Stylus CX3650"
+msgstr "Epson Stylus CX3650"
#: src/main/xmli18n-tmp.h:318
-#, fuzzy
msgid "Epson Stylus CX3700"
-msgstr "EPSON Stylus CX8300"
+msgstr "Epson Stylus CX3700"
#: src/main/xmli18n-tmp.h:319
-#, fuzzy
msgid "Epson Stylus CX3800"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX3800"
#: src/main/xmli18n-tmp.h:320
-#, fuzzy
msgid "Epson Stylus CX3805"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus CX3805"
#: src/main/xmli18n-tmp.h:321
-#, fuzzy
msgid "Epson Stylus CX3810"
-msgstr "EPSON Stylus CX3100"
+msgstr "Epson Stylus CX3810"
#: src/main/xmli18n-tmp.h:322
-#, fuzzy
msgid "Epson Stylus CX4100"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX4100"
#: src/main/xmli18n-tmp.h:323
-#, fuzzy
msgid "Epson Stylus CX4200"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX4200"
#: src/main/xmli18n-tmp.h:324
-#, fuzzy
msgid "Epson Stylus CX4500"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX4500"
#: src/main/xmli18n-tmp.h:325
-#, fuzzy
msgid "Epson Stylus CX4600"
-msgstr "EPSON Stylus CX4600"
+msgstr "Epson Stylus CX4600"
#: src/main/xmli18n-tmp.h:326
-#, fuzzy
msgid "Epson Stylus CX4700"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX4700"
#: src/main/xmli18n-tmp.h:327
-#, fuzzy
msgid "Epson Stylus CX4800"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX4800"
#: src/main/xmli18n-tmp.h:328
-#, fuzzy
msgid "Epson Stylus CX5100"
-msgstr "EPSON Stylus CX5100"
+msgstr "Epson Stylus CX5100"
#: src/main/xmli18n-tmp.h:329
-#, fuzzy
msgid "Epson Stylus CX5200"
-msgstr "EPSON Stylus CX5200"
+msgstr "Epson Stylus CX5200"
#: src/main/xmli18n-tmp.h:330
-#, fuzzy
msgid "Epson Stylus CX5300"
-msgstr "EPSON Stylus CX5300"
+msgstr "Epson Stylus CX5300"
#: src/main/xmli18n-tmp.h:331
-#, fuzzy
msgid "Epson Stylus CX5400"
-msgstr "EPSON Stylus CX5400"
+msgstr "Epson Stylus CX5400"
#: src/main/xmli18n-tmp.h:332
-#, fuzzy
msgid "Epson Stylus CX5700"
-msgstr "EPSON Stylus CX6500"
+msgstr "Epson Stylus CX5700"
#: src/main/xmli18n-tmp.h:333
-#, fuzzy
msgid "Epson Stylus CX5800"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX5800"
#: src/main/xmli18n-tmp.h:334
-#, fuzzy
msgid "Epson Stylus CX6300"
-msgstr "EPSON Stylus CX6300"
+msgstr "Epson Stylus CX6300"
#: src/main/xmli18n-tmp.h:335
-#, fuzzy
msgid "Epson Stylus CX6400"
-msgstr "EPSON Stylus CX6400"
+msgstr "Epson Stylus CX6400"
#: src/main/xmli18n-tmp.h:336
-#, fuzzy
msgid "Epson Stylus CX6500"
-msgstr "EPSON Stylus CX6500"
+msgstr "Epson Stylus CX6500"
#: src/main/xmli18n-tmp.h:337
-#, fuzzy
msgid "Epson Stylus CX6600"
-msgstr "EPSON Stylus CX6600"
+msgstr "Epson Stylus CX6600"
#: src/main/xmli18n-tmp.h:338
-#, fuzzy
msgid "Epson Stylus CX7700"
-msgstr "EPSON Stylus C70"
+msgstr "Epson Stylus CX7700"
#: src/main/xmli18n-tmp.h:339
-#, fuzzy
msgid "Epson Stylus CX7800"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX7800"
#: src/main/xmli18n-tmp.h:340
-#, fuzzy
msgid "Epson Stylus CX8300"
-msgstr "EPSON Stylus CX8300"
+msgstr "Epson Stylus CX8300"
#: src/main/xmli18n-tmp.h:341
-#, fuzzy
msgid "Epson Stylus CX8400"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus CX8400"
#: src/main/xmli18n-tmp.h:342
-#, fuzzy
msgid "Epson Stylus D68"
-msgstr "EPSON Stylus C46"
+msgstr "Epson Stylus D68"
#: src/main/xmli18n-tmp.h:343
-#, fuzzy
msgid "Epson Stylus D88"
-msgstr "EPSON Stylus C80"
+msgstr "Epson Stylus D88"
#: src/main/xmli18n-tmp.h:344
-#, fuzzy
msgid "Epson Stylus DX3800"
-msgstr "EPSON Stylus CX3100"
+msgstr "Epson Stylus DX3800"
#: src/main/xmli18n-tmp.h:345
-#, fuzzy
msgid "Epson Stylus DX3850"
-msgstr "EPSON Stylus CX3500"
+msgstr "Epson Stylus DX3850"
#: src/main/xmli18n-tmp.h:346
-#, fuzzy
msgid "Epson Stylus DX4200"
-msgstr "EPSON Stylus CX3200"
+msgstr "Epson Stylus DX4200"
#: src/main/xmli18n-tmp.h:347
-#, fuzzy
msgid "Epson Stylus DX4250"
-msgstr "EPSON Stylus CX8400"
+msgstr "Epson Stylus DX4250"
#: src/main/xmli18n-tmp.h:348
-#, fuzzy
msgid "Epson Stylus DX4800"
-msgstr "EPSON Stylus CX4600"
+msgstr "Epson Stylus DX4800"
#: src/main/xmli18n-tmp.h:349
msgid "Epson PictureMate"
-msgstr ""
+msgstr "Epson PictureMate"
#: src/main/xmli18n-tmp.h:350
msgid "Epson PictureMate Deluxe"
-msgstr ""
+msgstr "Epson PictureMate Deluxe"
#: src/main/xmli18n-tmp.h:351
-#, fuzzy
msgid "Epson CL 700"
-msgstr "Canon BJC 7000"
+msgstr "Epson CL 700"
#: src/main/xmli18n-tmp.h:352
msgid "Epson CL 750"
-msgstr ""
+msgstr "Epson CL 750"
#: src/main/xmli18n-tmp.h:353
msgid "Epson CL 760"
-msgstr ""
+msgstr "Epson CL 760"
#: src/main/xmli18n-tmp.h:354
msgid "Epson E 100"
-msgstr ""
+msgstr "Epson E 100"
#: src/main/xmli18n-tmp.h:355
msgid "Epson E 150"
-msgstr ""
+msgstr "Epson E 150"
#: src/main/xmli18n-tmp.h:356
msgid "Epson E 200"
-msgstr ""
+msgstr "Epson E 200"
#: src/main/xmli18n-tmp.h:357
-#, fuzzy
msgid "Epson EM 900C"
-msgstr "EPSON EM-900C"
+msgstr "Epson EM 900C"
#: src/main/xmli18n-tmp.h:358
-#, fuzzy
msgid "Epson EM 930C"
-msgstr "EPSON EM-930C"
+msgstr "Epson EM 930C"
#: src/main/xmli18n-tmp.h:359
-#, fuzzy
msgid "Epson MC 2000"
-msgstr "Canon BJC 2000"
+msgstr "Epson MC 2000"
#: src/main/xmli18n-tmp.h:360
-#, fuzzy
msgid "Epson MC 5000"
-msgstr "EPSON MC-5000"
+msgstr "Epson MC 5000"
#: src/main/xmli18n-tmp.h:361
-#, fuzzy
msgid "Epson MC 7000"
-msgstr "Canon BJC 7000"
+msgstr "Epson MC 7000"
#: src/main/xmli18n-tmp.h:362
-#, fuzzy
msgid "Epson MC 9000"
-msgstr "EPSON MC-9000"
+msgstr "Epson MC 9000"
#: src/main/xmli18n-tmp.h:363
-#, fuzzy
msgid "Epson MC 10000"
-msgstr "Canon BJC 1000"
+msgstr "Epson MC 10000"
#: src/main/xmli18n-tmp.h:364
-#, fuzzy
msgid "Epson MJ 930C"
-msgstr "EPSON MJ-930C"
+msgstr "Epson MJ 930C"
#: src/main/xmli18n-tmp.h:365
-#, fuzzy
msgid "Epson MJ 5100C"
-msgstr "EPSON MJ-5100C"
+msgstr "Epson MJ 5100C"
#: src/main/xmli18n-tmp.h:366
-#, fuzzy
msgid "Epson MJ 6000C"
-msgstr "Canon BJC 6000"
+msgstr "Epson MJ 6000C"
#: src/main/xmli18n-tmp.h:367
-#, fuzzy
msgid "Epson MJ 8000C"
-msgstr "EPSON MJ-8000C"
+msgstr "Epson MJ 8000C"
#: src/main/xmli18n-tmp.h:368
-#, fuzzy
msgid "Epson PM 700C"
-msgstr "EPSON PM-700C"
+msgstr "Epson PM 700C"
#: src/main/xmli18n-tmp.h:369
-#, fuzzy
msgid "Epson PM 730C"
-msgstr "EPSON PM-730C"
+msgstr "Epson PM 730C"
#: src/main/xmli18n-tmp.h:370
-#, fuzzy
msgid "Epson PM 740C"
-msgstr "EPSON PM-740C"
+msgstr "Epson PM 740C"
#: src/main/xmli18n-tmp.h:371
-#, fuzzy
msgid "Epson PM 750C"
-msgstr "EPSON PM-750C"
+msgstr "Epson PM 750C"
#: src/main/xmli18n-tmp.h:372
-#, fuzzy
msgid "Epson PM 760C"
-msgstr "EPSON PM-760C"
+msgstr "Epson PM 760C"
#: src/main/xmli18n-tmp.h:373
-#, fuzzy
msgid "Epson PM 770C"
-msgstr "EPSON PM-770C"
+msgstr "Epson PM 770C"
#: src/main/xmli18n-tmp.h:374
-#, fuzzy
msgid "Epson PM 780C"
-msgstr "EPSON PM-780C"
+msgstr "Epson PM 780C"
#: src/main/xmli18n-tmp.h:375
-#, fuzzy
msgid "Epson PM 790PT"
-msgstr "EPSON PM-790PT"
+msgstr "Epson PM 790PT"
#: src/main/xmli18n-tmp.h:376
-#, fuzzy
msgid "Epson PM 800C"
-msgstr "EPSON PM-800C"
+msgstr "Epson PM 800C"
#: src/main/xmli18n-tmp.h:377
-#, fuzzy
msgid "Epson PM 850PT"
-msgstr "EPSON PM-850PT"
+msgstr "Epson PM 850PT"
#: src/main/xmli18n-tmp.h:378
-#, fuzzy
msgid "Epson PM 870C"
-msgstr "EPSON PM-870C"
+msgstr "Epson PM 870C"
#: src/main/xmli18n-tmp.h:379
-#, fuzzy
msgid "Epson PM 880C"
-msgstr "EPSON PM-880C"
+msgstr "Epson PM 880C"
#: src/main/xmli18n-tmp.h:380
-#, fuzzy
msgid "Epson PM 930C"
-msgstr "EPSON PM-930C"
+msgstr "Epson PM 930C"
#: src/main/xmli18n-tmp.h:381
-#, fuzzy
msgid "Epson PM 940C"
-msgstr "EPSON PM-940C"
+msgstr "Epson PM 940C"
#: src/main/xmli18n-tmp.h:382
-#, fuzzy
msgid "Epson PM 950C"
-msgstr "EPSON PM-950C"
+msgstr "Epson PM 950C"
#: src/main/xmli18n-tmp.h:383
-#, fuzzy
msgid "Epson PM 970C"
-msgstr "EPSON PM-970C"
+msgstr "Epson PM 970C"
#: src/main/xmli18n-tmp.h:384
-#, fuzzy
msgid "Epson PM 980C"
-msgstr "EPSON PM-980C"
+msgstr "Epson PM 980C"
#: src/main/xmli18n-tmp.h:385
-#, fuzzy
msgid "Epson PM 2000C"
-msgstr "EPSON PM-2000C"
+msgstr "Epson PM 2000C"
#: src/main/xmli18n-tmp.h:386
-#, fuzzy
msgid "Epson PM 2200C"
-msgstr "EPSON PM-2200C"
+msgstr "Epson PM 2200C"
#: src/main/xmli18n-tmp.h:387
-#, fuzzy
msgid "Epson PM 3000C"
-msgstr "EPSON PM-3000C"
+msgstr "Epson PM 3000C"
#: src/main/xmli18n-tmp.h:388
-#, fuzzy
msgid "Epson PM 3300C"
-msgstr "EPSON PM-3300C"
+msgstr "Epson PM 3300C"
#: src/main/xmli18n-tmp.h:389
-#, fuzzy
msgid "Epson PM 3500C"
-msgstr "EPSON PM-3500C"
+msgstr "Epson PM 3500C"
#: src/main/xmli18n-tmp.h:390
-#, fuzzy
msgid "Epson PM 3700C"
-msgstr "EPSON PM-3700C"
+msgstr "Epson PM 3700C"
#: src/main/xmli18n-tmp.h:391
-#, fuzzy
msgid "Epson PM 4000PX"
-msgstr "EPSON PM-4000PX"
+msgstr "Epson PM 4000PX"
#: src/main/xmli18n-tmp.h:392
-#, fuzzy
msgid "Epson PM 5000C"
-msgstr "EPSON PM-5000C"
+msgstr "Epson PM 5000C"
#: src/main/xmli18n-tmp.h:393
-#, fuzzy
msgid "Epson PM 7000C"
-msgstr "EPSON PM-7000C"
+msgstr "Epson PM 7000C"
#: src/main/xmli18n-tmp.h:394
-#, fuzzy
msgid "Epson PM 9000C"
-msgstr "EPSON PM-9000C"
+msgstr "Epson PM 9000C"
#: src/main/xmli18n-tmp.h:395
-#, fuzzy
msgid "Epson PM 10000"
-msgstr "EPSON PM-10000"
+msgstr "Epson PM 10000"
#: src/main/xmli18n-tmp.h:396
msgid "Epson PM A650"
-msgstr ""
+msgstr "Epson PM A650"
#: src/main/xmli18n-tmp.h:397
msgid "Epson PM A750"
-msgstr ""
+msgstr "Epson PM A750"
#: src/main/xmli18n-tmp.h:398
msgid "Epson PM A890"
-msgstr ""
+msgstr "Epson PM A890"
#: src/main/xmli18n-tmp.h:399
msgid "Epson PM A900"
-msgstr ""
+msgstr "Epson PM A900"
#: src/main/xmli18n-tmp.h:400
msgid "Epson PM A950"
-msgstr ""
+msgstr "Epson PM A950"
#: src/main/xmli18n-tmp.h:401
msgid "Epson PM D600"
-msgstr ""
+msgstr "Epson PM D600"
#: src/main/xmli18n-tmp.h:402
-#, fuzzy
msgid "Epson PM D750"
-msgstr "EPSON PM-D750"
+msgstr "Epson PM D750"
#: src/main/xmli18n-tmp.h:403
-#, fuzzy
msgid "Epson PM D770"
-msgstr "EPSON PM-D770"
+msgstr "Epson PM D770"
#: src/main/xmli18n-tmp.h:404
msgid "Epson PM D800"
-msgstr ""
+msgstr "Epson PM D800"
#: src/main/xmli18n-tmp.h:405
-#, fuzzy
msgid "Epson PM D1000"
-msgstr "EPSON PM-D1000"
+msgstr "Epson PM D1000"
#: src/main/xmli18n-tmp.h:406
-#, fuzzy
msgid "Epson PM G700"
-msgstr "EPSON PM-G700"
+msgstr "Epson PM G700"
#: src/main/xmli18n-tmp.h:407
-#, fuzzy
msgid "Epson PM G720"
-msgstr "EPSON PM-G720"
+msgstr "Epson PM G720"
#: src/main/xmli18n-tmp.h:408
msgid "Epson PM G730"
-msgstr ""
+msgstr "Epson PM G730"
#: src/main/xmli18n-tmp.h:409
-#, fuzzy
msgid "Epson PM G800"
-msgstr "EPSON PM-G800"
+msgstr "Epson PM G800"
#: src/main/xmli18n-tmp.h:410
-#, fuzzy
msgid "Epson PM G820"
-msgstr "EPSON PM-G820"
+msgstr "Epson PM G820"
#: src/main/xmli18n-tmp.h:411
msgid "Epson PX A650"
-msgstr ""
+msgstr "Epson PX A650"
#: src/main/xmli18n-tmp.h:412
-#, fuzzy
msgid "Epson PX G900"
-msgstr "EPSON PX-G900"
+msgstr "Epson PX G900"
#: src/main/xmli18n-tmp.h:413
-#, fuzzy
msgid "Epson PX G920"
-msgstr "EPSON PX-G920"
+msgstr "Epson PX G920"
#: src/main/xmli18n-tmp.h:414
-#, fuzzy
msgid "Epson PX G5000"
-msgstr "EPSON PX-G5000"
+msgstr "Epson PX G5000"
#: src/main/xmli18n-tmp.h:415
-#, fuzzy
msgid "Epson PX V500"
-msgstr "EPSON PX-V500"
+msgstr "Epson PX V500"
#: src/main/xmli18n-tmp.h:416
-#, fuzzy
msgid "Epson PX V600"
-msgstr "EPSON PX-V600"
+msgstr "Epson PX V600"
#: src/main/xmli18n-tmp.h:417
msgid "Epson PX V630"
-msgstr ""
+msgstr "Epson PX V630"
#: src/main/xmli18n-tmp.h:418
msgid "Epson PX 5500"
-msgstr ""
+msgstr "Epson PX 5500"
#: src/main/xmli18n-tmp.h:419
-#, fuzzy
msgid "Epson PX 7000"
-msgstr "EPSON PX-7000"
+msgstr "Epson PX 7000"
#: src/main/xmli18n-tmp.h:420
-#, fuzzy
msgid "Epson PX 9000"
-msgstr "EPSON PX-9000"
+msgstr "Epson PX 9000"
#: src/main/xmli18n-tmp.h:421
msgid "Apollo P-2100"
-msgstr ""
+msgstr "Apollo P-2100"
#: src/main/xmli18n-tmp.h:422
msgid "Apollo P-2150"
-msgstr ""
+msgstr "Apollo P-2150"
#: src/main/xmli18n-tmp.h:423
msgid "Apollo P-2200"
-msgstr ""
+msgstr "Apollo P-2200"
#: src/main/xmli18n-tmp.h:424
msgid "Apollo P-2250"
-msgstr ""
+msgstr "Apollo P-2250"
#: src/main/xmli18n-tmp.h:425
msgid "Apollo P-2500"
-msgstr ""
+msgstr "Apollo P-2500"
#: src/main/xmli18n-tmp.h:426
msgid "Apollo P-2550"
-msgstr ""
+msgstr "Apollo P-2550"
#: src/main/xmli18n-tmp.h:427
msgid "Apollo P-2600"
-msgstr ""
+msgstr "Apollo P-2600"
#: src/main/xmli18n-tmp.h:428
msgid "Apollo P-2650"
-msgstr ""
+msgstr "Apollo P-2650"
#: src/main/xmli18n-tmp.h:429
msgid "Apple Color StyleWriter 4100"
@@ -4235,333 +3966,311 @@ msgstr "Apple Color StyleWriter 6500"
#: src/main/xmli18n-tmp.h:432
msgid "Apple LaserWriter Select 360"
-msgstr ""
+msgstr "Apple LaserWriter Select 360"
#: src/main/xmli18n-tmp.h:433
msgid "Brother DCP-1200"
-msgstr ""
+msgstr "Brother DCP-1200"
#: src/main/xmli18n-tmp.h:434
msgid "Brother HL-4Ve"
-msgstr ""
+msgstr "Brother HL-4Ve"
#: src/main/xmli18n-tmp.h:435
msgid "Brother HL-10V"
-msgstr ""
+msgstr "Brother HL-10V"
#: src/main/xmli18n-tmp.h:436
msgid "Brother HL-10h"
-msgstr ""
+msgstr "Brother HL-10h"
#: src/main/xmli18n-tmp.h:437
msgid "Brother HL-630"
-msgstr ""
+msgstr "Brother HL-630"
#: src/main/xmli18n-tmp.h:438
msgid "Brother HL-660"
-msgstr ""
+msgstr "Brother HL-660"
#: src/main/xmli18n-tmp.h:439
msgid "Brother HL-760"
-msgstr ""
+msgstr "Brother HL-760"
#: src/main/xmli18n-tmp.h:440
msgid "Brother HL-960"
-msgstr ""
+msgstr "Brother HL-960"
#: src/main/xmli18n-tmp.h:441
msgid "Brother HL-1040"
-msgstr ""
+msgstr "Brother HL-1040"
#: src/main/xmli18n-tmp.h:442
msgid "Brother HL-1050"
-msgstr ""
+msgstr "Brother HL-1050"
#: src/main/xmli18n-tmp.h:443
msgid "Brother HL-1060"
-msgstr ""
+msgstr "Brother HL-1060"
#: src/main/xmli18n-tmp.h:444
msgid "Brother HL-1070"
-msgstr ""
+msgstr "Brother HL-1070"
#: src/main/xmli18n-tmp.h:445
msgid "Brother HL-1240"
-msgstr ""
+msgstr "Brother HL-1240"
#: src/main/xmli18n-tmp.h:446
msgid "Brother HL-1250"
-msgstr ""
+msgstr "Brother HL-1250"
#: src/main/xmli18n-tmp.h:447
msgid "Brother HL-1260"
-msgstr ""
+msgstr "Brother HL-1260"
#: src/main/xmli18n-tmp.h:448
msgid "Brother HL-1270N"
-msgstr ""
+msgstr "Brother HL-1270N"
#: src/main/xmli18n-tmp.h:449
msgid "Brother HL-1440"
-msgstr ""
+msgstr "Brother HL-1440"
#: src/main/xmli18n-tmp.h:450
msgid "Brother HL-1660e"
-msgstr ""
+msgstr "Brother HL-1660e"
#: src/main/xmli18n-tmp.h:451
msgid "Brother HL-2060"
-msgstr ""
+msgstr "Brother HL-2060"
#: src/main/xmli18n-tmp.h:452
msgid "Brother MFC-6550MC"
-msgstr ""
+msgstr "Brother MFC-6550MC"
#: src/main/xmli18n-tmp.h:453
msgid "Brother MFC-8300"
-msgstr ""
+msgstr "Brother MFC-8300"
#: src/main/xmli18n-tmp.h:454
msgid "Brother MFC-9500"
-msgstr ""
+msgstr "Brother MFC-9500"
#: src/main/xmli18n-tmp.h:455
msgid "Brother MFC-9600"
-msgstr ""
+msgstr "Brother MFC-9600"
#: src/main/xmli18n-tmp.h:456
-#, fuzzy
msgid "Canon GP 335"
-msgstr "Canon BJC 85"
+msgstr "Canon GP 335"
#: src/main/xmli18n-tmp.h:457
-#, fuzzy
msgid "Canon LBP-4sx"
-msgstr "Canon BJC 240"
+msgstr "Canon LBP-4sx"
#: src/main/xmli18n-tmp.h:458
-#, fuzzy
msgid "Canon LBP-430"
-msgstr "Canon BJC 4300"
+msgstr "Canon LBP-430"
#: src/main/xmli18n-tmp.h:459
-#, fuzzy
msgid "Canon LBP-1000"
-msgstr "Canon CP100"
+msgstr "Canon LBP-1000"
#: src/main/xmli18n-tmp.h:460
-#, fuzzy
msgid "Canon LBP-1260"
-msgstr "Canon CP220"
+msgstr "Canon LBP-1260"
#: src/main/xmli18n-tmp.h:461
-#, fuzzy
msgid "Canon LBP-1760"
-msgstr "Canon CP100"
+msgstr "Canon LBP-1760"
#: src/main/xmli18n-tmp.h:462
msgid "Canon imageRunner 330s"
-msgstr ""
+msgstr "Canon imageRunner 330s"
#: src/main/xmli18n-tmp.h:463
msgid "Citizen ProJet II"
-msgstr ""
+msgstr "Citizen ProJet II"
#: src/main/xmli18n-tmp.h:464
msgid "DEC 1800"
-msgstr ""
+msgstr "DEC 1800"
#: src/main/xmli18n-tmp.h:465
msgid "DEC LN17"
-msgstr ""
+msgstr "DEC LN17"
#: src/main/xmli18n-tmp.h:466
msgid "Epson ActionLaser 1100"
-msgstr ""
+msgstr "Epson ActionLaser 1100"
#: src/main/xmli18n-tmp.h:467
msgid "Epson ActionLaser II"
-msgstr ""
+msgstr "Epson ActionLaser II"
#: src/main/xmli18n-tmp.h:468
msgid "Epson AcuLaser C2000"
-msgstr ""
+msgstr "Epson AcuLaser C2000"
#: src/main/xmli18n-tmp.h:469
msgid "Epson AcuLaser C2000PS"
-msgstr ""
+msgstr "Epson AcuLaser C2000PS"
#: src/main/xmli18n-tmp.h:470
msgid "Epson AcuLaser C8500"
-msgstr ""
+msgstr "Epson AcuLaser C8500"
#: src/main/xmli18n-tmp.h:471
msgid "Epson AcuLaser C8500PS"
-msgstr ""
+msgstr "Epson AcuLaser C8500PS"
#: src/main/xmli18n-tmp.h:472
msgid "Epson AcuLaser C8600"
-msgstr ""
+msgstr "Epson AcuLaser C8600"
#: src/main/xmli18n-tmp.h:473
msgid "Epson AcuLaser C8600PS"
-msgstr ""
+msgstr "Epson AcuLaser C8600PS"
#: src/main/xmli18n-tmp.h:474
msgid "Epson EPL-5200"
-msgstr ""
+msgstr "Epson EPL-5200"
#: src/main/xmli18n-tmp.h:475
msgid "Epson EPL-5200+"
-msgstr ""
+msgstr "Epson EPL-5200+"
#: src/main/xmli18n-tmp.h:476
msgid "Epson EPL-5700"
-msgstr ""
+msgstr "Epson EPL-5700"
#: src/main/xmli18n-tmp.h:477
msgid "Epson EPL-5700PS"
-msgstr ""
+msgstr "Epson EPL-5700PS"
#: src/main/xmli18n-tmp.h:478
msgid "Epson EPL-5800"
-msgstr ""
+msgstr "Epson EPL-5800"
#: src/main/xmli18n-tmp.h:479
msgid "Epson EPL-5800PS"
-msgstr ""
+msgstr "Epson EPL-5800PS"
#: src/main/xmli18n-tmp.h:480
msgid "Epson EPL-5900"
-msgstr ""
+msgstr "Epson EPL-5900"
#: src/main/xmli18n-tmp.h:481
msgid "Epson EPL-5900PS"
-msgstr ""
+msgstr "Epson EPL-5900PS"
#: src/main/xmli18n-tmp.h:482
msgid "Epson EPL-6100"
-msgstr ""
+msgstr "Epson EPL-6100"
#: src/main/xmli18n-tmp.h:483
msgid "Epson EPL-6100PS"
-msgstr ""
+msgstr "Epson EPL-6100PS"
#: src/main/xmli18n-tmp.h:484
msgid "Epson EPL-7100"
-msgstr ""
+msgstr "Epson EPL-7100"
#: src/main/xmli18n-tmp.h:485
msgid "Fujitsu PrintPartner 10V"
-msgstr ""
+msgstr "Fujitsu PrintPartner 10V"
#: src/main/xmli18n-tmp.h:486
msgid "Fujitsu PrintPartner 16DV"
-msgstr ""
+msgstr "Fujitsu PrintPartner 16DV"
#: src/main/xmli18n-tmp.h:487
msgid "Fujitsu PrintPartner 20W"
-msgstr ""
+msgstr "Fujitsu PrintPartner 20W"
#: src/main/xmli18n-tmp.h:488
msgid "Fujitsu PrintPartner 8000"
-msgstr ""
+msgstr "Fujitsu PrintPartner 8000"
#: src/main/xmli18n-tmp.h:489
-#, fuzzy
msgid "Generic PCL 4 Printer"
-msgstr "Új nyomtató meghatározása"
+msgstr "Ãltalános PCL 4 nyomtató"
#: src/main/xmli18n-tmp.h:490
-#, fuzzy
msgid "Generic PCL 5 Printer"
-msgstr "Új nyomtató meghatározása"
+msgstr "Ãltalános PCL 5 nyomtató"
#: src/main/xmli18n-tmp.h:491
-#, fuzzy
msgid "Generic PCL 5c Printer"
-msgstr "Új nyomtató meghatározása"
+msgstr "Ãltalános PCL 5c nyomtató"
#: src/main/xmli18n-tmp.h:492
-#, fuzzy
msgid "Generic PCL 5e Printer"
-msgstr "Új nyomtató meghatározása"
+msgstr "Ãltalános PCL 5e nyomtató"
#: src/main/xmli18n-tmp.h:493
msgid "Generic PCL 6/PCL XL Printer"
-msgstr ""
+msgstr "Ãltalános PCL 6/PCL XL nyomtató"
#: src/main/xmli18n-tmp.h:494
-#, fuzzy
msgid "HP Business Inkjet 2200"
-msgstr "HP DeskJet 1200C"
+msgstr "HP Business Inkjet 2200"
#: src/main/xmli18n-tmp.h:495
-#, fuzzy
msgid "HP Business Inkjet 2230"
-msgstr "HP DesignJet 230"
+msgstr "HP Business Inkjet 2230"
#: src/main/xmli18n-tmp.h:496
-#, fuzzy
msgid "HP Business Inkjet 2250"
-msgstr "HP DeskJet 1220C"
+msgstr "HP Business Inkjet 2250"
#: src/main/xmli18n-tmp.h:497
msgid "HP Business Inkjet 2250TN"
-msgstr ""
+msgstr "HP Business Inkjet 2250TN"
#: src/main/xmli18n-tmp.h:498
-#, fuzzy
msgid "HP Business Inkjet 2280"
-msgstr "HP DeskJet 1220C"
+msgstr "HP Business Inkjet 2280"
#: src/main/xmli18n-tmp.h:499
msgid "HP Color Inkjet Printer CP1160"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1160"
#: src/main/xmli18n-tmp.h:500
msgid "HP Color Inkjet Printer CP1700"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1700"
#: src/main/xmli18n-tmp.h:501
-#, fuzzy
msgid "HP Color LaserJet 2500"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 2500"
#: src/main/xmli18n-tmp.h:502
-#, fuzzy
msgid "HP Color LaserJet 4500"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4500"
#: src/main/xmli18n-tmp.h:503
-#, fuzzy
msgid "HP Color LaserJet 4550"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4550"
#: src/main/xmli18n-tmp.h:504
-#, fuzzy
msgid "HP Color LaserJet 4600"
-msgstr "HP LaserJet 4V"
+msgstr "HP Color LaserJet 4600"
#: src/main/xmli18n-tmp.h:505
-#, fuzzy
msgid "HP Color LaserJet 5"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5"
#: src/main/xmli18n-tmp.h:506
-#, fuzzy
msgid "HP Color LaserJet 5000"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5000"
#: src/main/xmli18n-tmp.h:507
-#, fuzzy
msgid "HP Color LaserJet 5500"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 5500"
#: src/main/xmli18n-tmp.h:508
-#, fuzzy
msgid "HP Color LaserJet 8550GN"
-msgstr "HP LaserJet 5Si"
+msgstr "HP Color LaserJet 8550GN"
#: src/main/xmli18n-tmp.h:509
msgid "HP DesignJet 230"
@@ -4592,42 +4301,36 @@ msgid "HP DesignJet 700"
msgstr "HP DesignJet 700"
#: src/main/xmli18n-tmp.h:516
-#, fuzzy
msgid "HP DesignJet 750C Plus"
-msgstr "HP DesignJet 750C"
+msgstr "HP DesignJet 750C Plus"
#: src/main/xmli18n-tmp.h:517
msgid "HP DesignJet 750C"
msgstr "HP DesignJet 750C"
#: src/main/xmli18n-tmp.h:518
-#, fuzzy
msgid "HP DesignJet 2500CP"
-msgstr "HP DesignJet 2500C"
+msgstr "HP DesignJet 2500CP"
#: src/main/xmli18n-tmp.h:519
-#, fuzzy
msgid "HP DesignJet 3500CP"
-msgstr "HP DesignJet 3500C"
+msgstr "HP DesignJet 3500CP"
#: src/main/xmli18n-tmp.h:520
-#, fuzzy
msgid "HP DesignJet ColorPro CAD"
-msgstr "HP DesignJet 455CA"
+msgstr "HP DesignJet ColorPro CAD"
#: src/main/xmli18n-tmp.h:521
msgid "HP DeskJet 400"
msgstr "HP DeskJet 400"
#: src/main/xmli18n-tmp.h:522
-#, fuzzy
msgid "HP DeskJet 420C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 420C"
#: src/main/xmli18n-tmp.h:523
-#, fuzzy
msgid "HP DeskJet 450"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 450"
#: src/main/xmli18n-tmp.h:524
msgid "HP DeskJet 500"
@@ -4638,14 +4341,12 @@ msgid "HP DeskJet 500C"
msgstr "HP DeskJet 500C"
#: src/main/xmli18n-tmp.h:526
-#, fuzzy
msgid "HP DeskJet 505J Plus"
-msgstr "HP DeskJet 520"
+msgstr "HP DeskJet 505J Plus"
#: src/main/xmli18n-tmp.h:527
-#, fuzzy
msgid "HP DeskJet 510"
-msgstr "HP DeskJet 500"
+msgstr "HP DeskJet 510"
#: src/main/xmli18n-tmp.h:528
msgid "HP DeskJet 520"
@@ -4660,123 +4361,100 @@ msgid "HP DeskJet 550C"
msgstr "HP DeskJet 550C"
#: src/main/xmli18n-tmp.h:531
-#, fuzzy
msgid "HP DeskJet 5550"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 5550"
#: src/main/xmli18n-tmp.h:532
-#, fuzzy
msgid "HP DeskJet 5551"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 5551"
#: src/main/xmli18n-tmp.h:533
msgid "HP DeskJet 560C"
msgstr "HP DeskJet 560C"
#: src/main/xmli18n-tmp.h:534
-#, fuzzy
msgid "HP DeskJet 600"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 600"
#: src/main/xmli18n-tmp.h:535
-#, fuzzy
msgid "HP DeskJet 600C"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 600C"
#: src/main/xmli18n-tmp.h:536
-#, fuzzy
msgid "HP DeskJet 610C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 610C"
#: src/main/xmli18n-tmp.h:537
-#, fuzzy
msgid "HP DeskJet 610CL"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 610CL"
#: src/main/xmli18n-tmp.h:538
-#, fuzzy
msgid "HP DeskJet 6122"
-msgstr "HP DeskJet 1220C"
+msgstr "HP DeskJet 6122"
#: src/main/xmli18n-tmp.h:539
-#, fuzzy
msgid "HP DeskJet 6127"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 6127"
#: src/main/xmli18n-tmp.h:540
-#, fuzzy
msgid "HP DeskJet 612C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 612C"
#: src/main/xmli18n-tmp.h:541
-#, fuzzy
msgid "HP DeskJet 640C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 640C"
#: src/main/xmli18n-tmp.h:542
-#, fuzzy
msgid "HP DeskJet 648C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 648C"
#: src/main/xmli18n-tmp.h:543
-#, fuzzy
msgid "HP DeskJet 660C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 660C"
#: src/main/xmli18n-tmp.h:544
-#, fuzzy
msgid "HP DeskJet 670C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 670C"
#: src/main/xmli18n-tmp.h:545
-#, fuzzy
msgid "HP DeskJet 670TV"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 670TV"
#: src/main/xmli18n-tmp.h:546
-#, fuzzy
msgid "HP DeskJet 672C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 672C"
#: src/main/xmli18n-tmp.h:547
-#, fuzzy
msgid "HP DeskJet 680C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 680C"
#: src/main/xmli18n-tmp.h:548
-#, fuzzy
msgid "HP DeskJet 682C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 682C"
#: src/main/xmli18n-tmp.h:549
-#, fuzzy
msgid "HP DeskJet 690C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 690C"
#: src/main/xmli18n-tmp.h:550
-#, fuzzy
msgid "HP DeskJet 692C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 692C"
#: src/main/xmli18n-tmp.h:551
-#, fuzzy
msgid "HP DeskJet 693C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 693C"
#: src/main/xmli18n-tmp.h:552
-#, fuzzy
msgid "HP DeskJet 694C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 694C"
#: src/main/xmli18n-tmp.h:553
-#, fuzzy
msgid "HP DeskJet 695C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 695C"
#: src/main/xmli18n-tmp.h:554
-#, fuzzy
msgid "HP DeskJet 697C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 697C"
#: src/main/xmli18n-tmp.h:555
msgid "HP DeskJet 810C"
@@ -4787,47 +4465,40 @@ msgid "HP DeskJet 812C"
msgstr "HP DeskJet 812C"
#: src/main/xmli18n-tmp.h:557
-#, fuzzy
msgid "HP DeskJet 815C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 815C"
#: src/main/xmli18n-tmp.h:558
-#, fuzzy
msgid "HP DeskJet 816C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 816C"
#: src/main/xmli18n-tmp.h:559
-#, fuzzy
msgid "HP DeskJet 825C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 825C"
#: src/main/xmli18n-tmp.h:560
-#, fuzzy
msgid "HP DeskJet 830C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 830C"
#: src/main/xmli18n-tmp.h:561
-#, fuzzy
msgid "HP DeskJet 832C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 832C"
#: src/main/xmli18n-tmp.h:562
msgid "HP DeskJet 840C"
msgstr "HP DeskJet 840C"
#: src/main/xmli18n-tmp.h:563
-#, fuzzy
msgid "HP DeskJet 841C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 841C"
#: src/main/xmli18n-tmp.h:564
msgid "HP DeskJet 842C"
msgstr "HP DeskJet 842C"
#: src/main/xmli18n-tmp.h:565
-#, fuzzy
msgid "HP DeskJet 843C"
-msgstr "HP DeskJet 840C"
+msgstr "HP DeskJet 843C"
#: src/main/xmli18n-tmp.h:566
msgid "HP DeskJet 845C"
@@ -4846,14 +4517,12 @@ msgid "HP DeskJet 870C"
msgstr "HP DeskJet 870C"
#: src/main/xmli18n-tmp.h:570
-#, fuzzy
msgid "HP DeskJet 880C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 880C"
#: src/main/xmli18n-tmp.h:571
-#, fuzzy
msgid "HP DeskJet 882C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 882C"
#: src/main/xmli18n-tmp.h:572
msgid "HP DeskJet 890C"
@@ -4864,109 +4533,88 @@ msgid "HP DeskJet 895C"
msgstr "HP DeskJet 895C"
#: src/main/xmli18n-tmp.h:574
-#, fuzzy
msgid "HP DeskJet 916C"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 916C"
#: src/main/xmli18n-tmp.h:575
-#, fuzzy
msgid "HP DeskJet 920C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 920C"
#: src/main/xmli18n-tmp.h:576
-#, fuzzy
msgid "HP DeskJet 9300"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 9300"
#: src/main/xmli18n-tmp.h:577
-#, fuzzy
msgid "HP DeskJet 930C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 930C"
#: src/main/xmli18n-tmp.h:578
-#, fuzzy
msgid "HP DeskJet 932C"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 932C"
#: src/main/xmli18n-tmp.h:579
-#, fuzzy
msgid "HP DeskJet 933C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 933C"
#: src/main/xmli18n-tmp.h:580
-#, fuzzy
msgid "HP DeskJet 934C"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 934C"
#: src/main/xmli18n-tmp.h:581
-#, fuzzy
msgid "HP DeskJet 935C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 935C"
#: src/main/xmli18n-tmp.h:582
-#, fuzzy
msgid "HP DeskJet 940C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 940C"
#: src/main/xmli18n-tmp.h:583
-#, fuzzy
msgid "HP DeskJet 948C"
-msgstr "HP DeskJet 540C"
+msgstr "HP DeskJet 948C"
#: src/main/xmli18n-tmp.h:584
-#, fuzzy
msgid "HP DeskJet 950C"
-msgstr "HP DeskJet 500C"
+msgstr "HP DeskJet 950C"
#: src/main/xmli18n-tmp.h:585
-#, fuzzy
msgid "HP DeskJet 952C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 952C"
#: src/main/xmli18n-tmp.h:586
-#, fuzzy
msgid "HP DeskJet 955C"
-msgstr "HP DeskJet 550C"
+msgstr "HP DeskJet 955C"
#: src/main/xmli18n-tmp.h:587
-#, fuzzy
msgid "HP DeskJet 957C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 957C"
#: src/main/xmli18n-tmp.h:588
-#, fuzzy
msgid "HP DeskJet 959C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 959C"
#: src/main/xmli18n-tmp.h:589
-#, fuzzy
msgid "HP DeskJet 960C"
-msgstr "HP DeskJet 560C"
+msgstr "HP DeskJet 960C"
#: src/main/xmli18n-tmp.h:590
-#, fuzzy
msgid "HP DeskJet 970C"
-msgstr "HP DeskJet 870C"
+msgstr "HP DeskJet 970C"
#: src/main/xmli18n-tmp.h:591
-#, fuzzy
msgid "HP DeskJet 975C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 975C"
#: src/main/xmli18n-tmp.h:592
-#, fuzzy
msgid "HP DeskJet 980C"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 980C"
#: src/main/xmli18n-tmp.h:593
-#, fuzzy
msgid "HP DeskJet 990C"
-msgstr "HP DeskJet 890C"
+msgstr "HP DeskJet 990C"
#: src/main/xmli18n-tmp.h:594
-#, fuzzy
msgid "HP DeskJet 995C"
-msgstr "HP DeskJet 895C"
+msgstr "HP DeskJet 995C"
#: src/main/xmli18n-tmp.h:595
msgid "HP DeskJet 1100C"
@@ -4977,9 +4625,8 @@ msgid "HP DeskJet 1120C"
msgstr "HP DeskJet 1120C"
#: src/main/xmli18n-tmp.h:597
-#, fuzzy
msgid "HP DeskJet 1125C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP DeskJet 1125C"
#: src/main/xmli18n-tmp.h:598
msgid "HP DeskJet 1200C"
@@ -4994,118 +4641,96 @@ msgid "HP DeskJet 1600C"
msgstr "HP DeskJet 1600C"
#: src/main/xmli18n-tmp.h:601
-#, fuzzy
msgid "HP DeskJet 1600CM"
-msgstr "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600CM"
#: src/main/xmli18n-tmp.h:602
-#, fuzzy
msgid "HP DeskJet 2000"
-msgstr "HP DeskJet 1200C"
+msgstr "HP DeskJet 2000"
#: src/main/xmli18n-tmp.h:603
-#, fuzzy
msgid "HP DeskJet 2500"
-msgstr "HP DeskJet 500"
+msgstr "HP DeskJet 2500"
#: src/main/xmli18n-tmp.h:604
-#, fuzzy
msgid "HP DeskJet 2500CM"
-msgstr "HP DeskJet 500C"
+msgstr "HP DeskJet 2500CM"
#: src/main/xmli18n-tmp.h:605
-#, fuzzy
msgid "HP DeskJet 340C"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 340C"
#: src/main/xmli18n-tmp.h:606
-#, fuzzy
msgid "HP DeskJet 3810"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 3810"
#: src/main/xmli18n-tmp.h:607
-#, fuzzy
msgid "HP DeskJet 3816"
-msgstr "HP DeskJet 810C"
+msgstr "HP DeskJet 3816"
#: src/main/xmli18n-tmp.h:608
-#, fuzzy
msgid "HP DeskJet 3820"
-msgstr "HP DeskJet 340"
+msgstr "HP DeskJet 3820"
#: src/main/xmli18n-tmp.h:609
-#, fuzzy
msgid "HP DeskJet 3822"
-msgstr "HP DeskJet 812C"
+msgstr "HP DeskJet 3822"
#: src/main/xmli18n-tmp.h:610
-#, fuzzy
msgid "HP LaserJet 2"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2"
#: src/main/xmli18n-tmp.h:611
-#, fuzzy
msgid "HP LaserJet 2D"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2D"
#: src/main/xmli18n-tmp.h:612
-#, fuzzy
msgid "HP LaserJet 2P Plus"
-msgstr "HP LaserJet IIP sorozat"
+msgstr "HP LaserJet 2P Plus"
#: src/main/xmli18n-tmp.h:613
-#, fuzzy
msgid "HP LaserJet 2P"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2P"
#: src/main/xmli18n-tmp.h:614
-#, fuzzy
msgid "HP LaserJet 3"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3"
#: src/main/xmli18n-tmp.h:615
-#, fuzzy
msgid "HP LaserJet 3D"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3D"
#: src/main/xmli18n-tmp.h:616
-#, fuzzy
msgid "HP LaserJet 3P w/ PCL5"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3P PCL5 támogatással"
#: src/main/xmli18n-tmp.h:617
-#, fuzzy
msgid "HP LaserJet 3P w/PS"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 3P PS támogatással"
#: src/main/xmli18n-tmp.h:618
-#, fuzzy
msgid "HP LaserJet 4 Plus"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4 Plus"
#: src/main/xmli18n-tmp.h:619
-#, fuzzy
msgid "HP LaserJet 4"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 4"
#: src/main/xmli18n-tmp.h:620
msgid "HP LaserJet 4L"
msgstr "HP LaserJet 4L"
#: src/main/xmli18n-tmp.h:621
-#, fuzzy
msgid "HP LaserJet 4M"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4M"
#: src/main/xmli18n-tmp.h:622
-#, fuzzy
msgid "HP LaserJet 4ML"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4ML"
#: src/main/xmli18n-tmp.h:623
-#, fuzzy
msgid "HP LaserJet 4P"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4P"
#: src/main/xmli18n-tmp.h:624
msgid "HP LaserJet 4Si"
@@ -5116,540 +4741,444 @@ msgid "HP LaserJet 4V"
msgstr "HP LaserJet 4V"
#: src/main/xmli18n-tmp.h:626
-#, fuzzy
msgid "HP LaserJet 5"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5"
#: src/main/xmli18n-tmp.h:627
-#, fuzzy
msgid "HP LaserJet 5L"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 5L"
#: src/main/xmli18n-tmp.h:628
-#, fuzzy
msgid "HP LaserJet 5M"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5M"
#: src/main/xmli18n-tmp.h:629
-#, fuzzy
msgid "HP LaserJet 5MP"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5MP"
#: src/main/xmli18n-tmp.h:630
-#, fuzzy
msgid "HP LaserJet 5P"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5P"
#: src/main/xmli18n-tmp.h:631
msgid "HP LaserJet 5Si"
msgstr "HP LaserJet 5Si"
#: src/main/xmli18n-tmp.h:632
-#, fuzzy
msgid "HP LaserJet 6"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6"
#: src/main/xmli18n-tmp.h:633
-#, fuzzy
msgid "HP LaserJet 6L"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 6L"
#: src/main/xmli18n-tmp.h:634
-#, fuzzy
msgid "HP LaserJet 6MP"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6MP"
#: src/main/xmli18n-tmp.h:635
-#, fuzzy
msgid "HP LaserJet 6P"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 6P"
#: src/main/xmli18n-tmp.h:636
-#, fuzzy
msgid "HP LaserJet 1010"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1010"
#: src/main/xmli18n-tmp.h:637
-#, fuzzy
msgid "HP LaserJet 1012"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1012"
#: src/main/xmli18n-tmp.h:638
-#, fuzzy
msgid "HP LaserJet 1015"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 1015"
#: src/main/xmli18n-tmp.h:639
-#, fuzzy
msgid "HP LaserJet 1100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1100"
#: src/main/xmli18n-tmp.h:640
-#, fuzzy
msgid "HP LaserJet 1100A"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 1100A"
#: src/main/xmli18n-tmp.h:641
-#, fuzzy
msgid "HP LaserJet 1150"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 1150"
#: src/main/xmli18n-tmp.h:642
-#, fuzzy
msgid "HP LaserJet 1200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1200"
#: src/main/xmli18n-tmp.h:643
-#, fuzzy
msgid "HP LaserJet 1220"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1220"
#: src/main/xmli18n-tmp.h:644
-#, fuzzy
msgid "HP LaserJet 1300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 1300"
#: src/main/xmli18n-tmp.h:645
-#, fuzzy
msgid "HP LaserJet 2100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2100"
#: src/main/xmli18n-tmp.h:646
-#, fuzzy
msgid "HP LaserJet 2100M"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 2100M"
#: src/main/xmli18n-tmp.h:647
-#, fuzzy
msgid "HP LaserJet 2200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2200"
#: src/main/xmli18n-tmp.h:648
-#, fuzzy
msgid "HP LaserJet 2300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 2300"
#: src/main/xmli18n-tmp.h:649
-#, fuzzy
msgid "HP LaserJet 3200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3200"
#: src/main/xmli18n-tmp.h:650
-#, fuzzy
msgid "HP LaserJet 3200m"
-msgstr "HP LaserJet 4V"
+msgstr "HP LaserJet 3200m"
#: src/main/xmli18n-tmp.h:651
-#, fuzzy
msgid "HP LaserJet 3200se"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3200se"
#: src/main/xmli18n-tmp.h:652
-#, fuzzy
msgid "HP LaserJet 3300 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3300 MFP"
#: src/main/xmli18n-tmp.h:653
-#, fuzzy
msgid "HP LaserJet 3310 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3310 MFP"
#: src/main/xmli18n-tmp.h:654
-#, fuzzy
msgid "HP LaserJet 3320 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3320 MFP"
#: src/main/xmli18n-tmp.h:655
-#, fuzzy
msgid "HP LaserJet 3320N MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3320N MFP"
#: src/main/xmli18n-tmp.h:656
-#, fuzzy
msgid "HP LaserJet 3330 MFP"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 3330 MFP"
#: src/main/xmli18n-tmp.h:657
-#, fuzzy
msgid "HP LaserJet 4000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4000"
#: src/main/xmli18n-tmp.h:658
-#, fuzzy
msgid "HP LaserJet 4050"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4050"
#: src/main/xmli18n-tmp.h:659
-#, fuzzy
msgid "HP LaserJet 4100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4100"
#: src/main/xmli18n-tmp.h:660
-#, fuzzy
msgid "HP LaserJet 4200"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4200"
#: src/main/xmli18n-tmp.h:661
-#, fuzzy
msgid "HP LaserJet 4300"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 4300"
#: src/main/xmli18n-tmp.h:662
-#, fuzzy
msgid "HP LaserJet 5000"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5000"
#: src/main/xmli18n-tmp.h:663
-#, fuzzy
msgid "HP LaserJet 5100"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 5100"
#: src/main/xmli18n-tmp.h:664
-#, fuzzy
msgid "HP LaserJet 8000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 8000"
#: src/main/xmli18n-tmp.h:665
-#, fuzzy
msgid "HP LaserJet 8100"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 8100"
#: src/main/xmli18n-tmp.h:666
-#, fuzzy
msgid "HP LaserJet 8150"
-msgstr "HP LaserJet 5Si"
+msgstr "HP LaserJet 8150"
#: src/main/xmli18n-tmp.h:667
-#, fuzzy
msgid "HP LaserJet 9000"
-msgstr "HP LaserJet 4L"
+msgstr "HP LaserJet 9000"
#: src/main/xmli18n-tmp.h:668
msgid "HP Mopier 240"
-msgstr ""
+msgstr "HP Mopier 240"
#: src/main/xmli18n-tmp.h:669
msgid "HP Mopier 320"
-msgstr ""
+msgstr "HP Mopier 320"
#: src/main/xmli18n-tmp.h:670
-#, fuzzy
msgid "HP OfficeJet 300"
-msgstr "HP DeskJet 500"
+msgstr "HP OfficeJet 300"
#: src/main/xmli18n-tmp.h:671
-#, fuzzy
msgid "HP OfficeJet 330"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 330"
#: src/main/xmli18n-tmp.h:672
-#, fuzzy
msgid "HP OfficeJet 350"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 350"
#: src/main/xmli18n-tmp.h:673
-#, fuzzy
msgid "HP OfficeJet 500"
-msgstr "HP DeskJet 500"
+msgstr "HP OfficeJet 500"
#: src/main/xmli18n-tmp.h:674
-#, fuzzy
msgid "HP OfficeJet 520"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 520"
#: src/main/xmli18n-tmp.h:675
-#, fuzzy
msgid "HP OfficeJet 570"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 570"
#: src/main/xmli18n-tmp.h:676
-#, fuzzy
msgid "HP OfficeJet 580"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 580"
#: src/main/xmli18n-tmp.h:677
-#, fuzzy
msgid "HP OfficeJet 590"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 590"
#: src/main/xmli18n-tmp.h:678
-#, fuzzy
msgid "HP OfficeJet 600"
-msgstr "HP DeskJet 1600C"
+msgstr "HP OfficeJet 600"
#: src/main/xmli18n-tmp.h:679
-#, fuzzy
msgid "HP OfficeJet 610"
-msgstr "HP DeskJet 810C"
+msgstr "HP OfficeJet 610"
#: src/main/xmli18n-tmp.h:680
-#, fuzzy
msgid "HP OfficeJet 625"
-msgstr "HP DesignJet 250C"
+msgstr "HP OfficeJet 625"
#: src/main/xmli18n-tmp.h:681
-#, fuzzy
msgid "HP OfficeJet 630"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 630"
#: src/main/xmli18n-tmp.h:682
-#, fuzzy
msgid "HP OfficeJet 635"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 635"
#: src/main/xmli18n-tmp.h:683
-#, fuzzy
msgid "HP OfficeJet 700"
-msgstr "HP DesignJet 700"
+msgstr "HP OfficeJet 700"
#: src/main/xmli18n-tmp.h:684
-#, fuzzy
msgid "HP OfficeJet 710"
-msgstr "HP DeskJet 870C"
+msgstr "HP OfficeJet 710"
#: src/main/xmli18n-tmp.h:685
-#, fuzzy
msgid "HP OfficeJet 720"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 720"
#: src/main/xmli18n-tmp.h:686
-#, fuzzy
msgid "HP OfficeJet 725"
-msgstr "HP DesignJet 250C"
+msgstr "HP OfficeJet 725"
#: src/main/xmli18n-tmp.h:687
-#, fuzzy
msgid "HP OfficeJet 5105"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet 5105"
#: src/main/xmli18n-tmp.h:688
-#, fuzzy
msgid "HP OfficeJet 5110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 5110"
#: src/main/xmli18n-tmp.h:689
-#, fuzzy
msgid "HP OfficeJet 5110xi"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 5110xi"
#: src/main/xmli18n-tmp.h:690
-#, fuzzy
msgid "HP OfficeJet 6105"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet 6105"
#: src/main/xmli18n-tmp.h:691
-#, fuzzy
msgid "HP OfficeJet 6110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 6110"
#: src/main/xmli18n-tmp.h:692
-#, fuzzy
msgid "HP OfficeJet 7110"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet 7110"
#: src/main/xmli18n-tmp.h:693
-#, fuzzy
msgid "HP OfficeJet 7130"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet 7130"
#: src/main/xmli18n-tmp.h:694
-#, fuzzy
msgid "HP OfficeJet 7140"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet 7140"
#: src/main/xmli18n-tmp.h:695
-#, fuzzy
msgid "HP OfficeJet D125"
-msgstr "HP DeskJet 812C"
+msgstr "HP OfficeJet D125"
#: src/main/xmli18n-tmp.h:696
msgid "HP OfficeJet D135"
-msgstr ""
+msgstr "HP OfficeJet D135"
#: src/main/xmli18n-tmp.h:697
-#, fuzzy
msgid "HP OfficeJet D145"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet D145"
#: src/main/xmli18n-tmp.h:698
-#, fuzzy
msgid "HP OfficeJet D155"
-msgstr "HP DeskJet 550C"
+msgstr "HP OfficeJet D155"
#: src/main/xmli18n-tmp.h:699
-#, fuzzy
msgid "HP OfficeJet G55"
-msgstr "HP DeskJet 855C"
+msgstr "HP OfficeJet G55"
#: src/main/xmli18n-tmp.h:700
-#, fuzzy
msgid "HP OfficeJet G85"
-msgstr "HP DeskJet 895C"
+msgstr "HP OfficeJet G85"
#: src/main/xmli18n-tmp.h:701
-#, fuzzy
msgid "HP OfficeJet G95"
-msgstr "HP DeskJet 895C"
+msgstr "HP OfficeJet G95"
#: src/main/xmli18n-tmp.h:702
-#, fuzzy
msgid "HP OfficeJet K60"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet K60"
#: src/main/xmli18n-tmp.h:703
-#, fuzzy
msgid "HP OfficeJet K60xi"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet K60xi"
#: src/main/xmli18n-tmp.h:704
-#, fuzzy
msgid "HP OfficeJet K80"
-msgstr "HP DeskJet 890C"
+msgstr "HP OfficeJet K80"
#: src/main/xmli18n-tmp.h:705
-#, fuzzy
msgid "HP OfficeJet K80xi"
-msgstr "HP DeskJet 810C"
+msgstr "HP OfficeJet K80xi"
#: src/main/xmli18n-tmp.h:706
-#, fuzzy
msgid "HP OfficeJet LX"
-msgstr "HP LaserJet 4L"
+msgstr "HP OfficeJet LX"
#: src/main/xmli18n-tmp.h:707
-#, fuzzy
msgid "HP OfficeJet Pro 1150C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet Pro 1150C"
#: src/main/xmli18n-tmp.h:708
-#, fuzzy
msgid "HP OfficeJet Pro 1170C"
-msgstr "HP DeskJet 1120C"
+msgstr "HP OfficeJet Pro 1170C"
#: src/main/xmli18n-tmp.h:709
msgid "HP OfficeJet Pro 1175C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1175C"
#: src/main/xmli18n-tmp.h:710
-#, fuzzy
msgid "HP OfficeJet R40"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet R40"
#: src/main/xmli18n-tmp.h:711
-#, fuzzy
msgid "HP OfficeJet R45"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet R45"
#: src/main/xmli18n-tmp.h:712
-#, fuzzy
msgid "HP OfficeJet R60"
-msgstr "HP DeskJet 560C"
+msgstr "HP OfficeJet R60"
#: src/main/xmli18n-tmp.h:713
-#, fuzzy
msgid "HP OfficeJet R65"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet R65"
#: src/main/xmli18n-tmp.h:714
-#, fuzzy
msgid "HP OfficeJet R80"
-msgstr "HP DeskJet 890C"
+msgstr "HP OfficeJet R80"
#: src/main/xmli18n-tmp.h:715
-#, fuzzy
msgid "HP OfficeJet T45"
-msgstr "HP DeskJet 845C"
+msgstr "HP OfficeJet T45"
#: src/main/xmli18n-tmp.h:716
-#, fuzzy
msgid "HP OfficeJet T65"
-msgstr "HP DeskJet 520"
+msgstr "HP OfficeJet T65"
#: src/main/xmli18n-tmp.h:717
-#, fuzzy
msgid "HP OfficeJet V40"
-msgstr "HP DeskJet 400"
+msgstr "HP OfficeJet V40"
#: src/main/xmli18n-tmp.h:718
-#, fuzzy
msgid "HP OfficeJet V40xi"
-msgstr "HP DeskJet 340"
+msgstr "HP OfficeJet V40xi"
#: src/main/xmli18n-tmp.h:719
msgid "HP OfficeJet"
-msgstr ""
+msgstr "HP OfficeJet"
#: src/main/xmli18n-tmp.h:720
msgid "HP PSC 370"
-msgstr ""
+msgstr "HP PSC 370"
#: src/main/xmli18n-tmp.h:721
msgid "HP PSC 380"
-msgstr ""
+msgstr "HP PSC 380"
#: src/main/xmli18n-tmp.h:722
msgid "HP PSC 500"
-msgstr ""
+msgstr "HP PSC 500"
#: src/main/xmli18n-tmp.h:723
msgid "HP PSC 750"
-msgstr ""
+msgstr "HP PSC 750"
#: src/main/xmli18n-tmp.h:724
msgid "HP PSC 950"
-msgstr ""
+msgstr "HP PSC 950"
#: src/main/xmli18n-tmp.h:725
msgid "HP PSC 950xi"
-msgstr ""
+msgstr "HP PSC 950xi"
#: src/main/xmli18n-tmp.h:726
-#, fuzzy
msgid "HP PSC 2110"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PSC 2110"
#: src/main/xmli18n-tmp.h:727
msgid "HP PSC 2150"
-msgstr ""
+msgstr "HP PSC 2150"
#: src/main/xmli18n-tmp.h:728
msgid "HP PSC 2210"
-msgstr ""
+msgstr "HP PSC 2210"
#: src/main/xmli18n-tmp.h:729
-#, fuzzy
msgid "HP PhotoSmart 7150"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7150"
#: src/main/xmli18n-tmp.h:730
-#, fuzzy
msgid "HP PhotoSmart 7345"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7345"
#: src/main/xmli18n-tmp.h:731
-#, fuzzy
msgid "HP PhotoSmart 7350"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7350"
#: src/main/xmli18n-tmp.h:732
-#, fuzzy
msgid "HP PhotoSmart 7550"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart 7550"
#: src/main/xmli18n-tmp.h:733
-#, fuzzy
msgid "HP PhotoSmart P100"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P100"
#: src/main/xmli18n-tmp.h:734
-#, fuzzy
msgid "HP PhotoSmart P130"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P130"
#: src/main/xmli18n-tmp.h:735
-#, fuzzy
msgid "HP PhotoSmart P230"
-msgstr "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P230"
#: src/main/xmli18n-tmp.h:736
msgid "HP PhotoSmart P1000"
@@ -5660,512 +5189,504 @@ msgid "HP PhotoSmart P1100"
msgstr "HP PhotoSmart P1100"
#: src/main/xmli18n-tmp.h:738
-#, fuzzy
msgid "HP PhotoSmart P1115"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1115"
#: src/main/xmli18n-tmp.h:739
-#, fuzzy
msgid "HP PhotoSmart P1215"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1215"
#: src/main/xmli18n-tmp.h:740
-#, fuzzy
msgid "HP PhotoSmart P1218"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1218"
#: src/main/xmli18n-tmp.h:741
-#, fuzzy
msgid "HP PhotoSmart P1315"
-msgstr "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1315"
#: src/main/xmli18n-tmp.h:742
-#, fuzzy
msgid "HP e-printer e20"
-msgstr "HP DesignJet 230"
+msgstr "HP e-printer e20"
#: src/main/xmli18n-tmp.h:743
msgid "IBM 4019"
-msgstr ""
+msgstr "IBM 4019"
#: src/main/xmli18n-tmp.h:744
msgid "IBM 4029 030 LaserPrinter 10"
-msgstr ""
+msgstr "IBM 4029 030 LaserPrinter 10"
#: src/main/xmli18n-tmp.h:745
msgid "IBM 4312"
-msgstr ""
+msgstr "IBM 4312"
#: src/main/xmli18n-tmp.h:746
msgid "IBM Infoprint 12"
-msgstr ""
+msgstr "IBM Infoprint 12"
#: src/main/xmli18n-tmp.h:747
msgid "IBM Page Printer 3112"
-msgstr ""
+msgstr "IBM Page Printer 3112"
#: src/main/xmli18n-tmp.h:748
msgid "Infotec 4651 MF"
-msgstr ""
+msgstr "Infotec 4651 MF"
#: src/main/xmli18n-tmp.h:749
msgid "Kyocera F-1010"
-msgstr ""
+msgstr "Kyocera F-1010"
#: src/main/xmli18n-tmp.h:750
msgid "Kyocera FS-600 - KPDL-2"
-msgstr ""
+msgstr "Kyocera FS-600 - KPDL-2"
#: src/main/xmli18n-tmp.h:751
msgid "Kyocera FS-600"
-msgstr ""
+msgstr "Kyocera FS-600"
#: src/main/xmli18n-tmp.h:752
msgid "Kyocera FS-680"
-msgstr ""
+msgstr "Kyocera FS-680"
#: src/main/xmli18n-tmp.h:753
msgid "Kyocera FS-800"
-msgstr ""
+msgstr "Kyocera FS-800"
#: src/main/xmli18n-tmp.h:754
msgid "Kyocera FS-1000"
-msgstr ""
+msgstr "Kyocera FS-1000"
#: src/main/xmli18n-tmp.h:755
msgid "Kyocera FS-1000+"
-msgstr ""
+msgstr "Kyocera FS-1000+"
#: src/main/xmli18n-tmp.h:756
msgid "Kyocera FS-1010"
-msgstr ""
+msgstr "Kyocera FS-1010"
#: src/main/xmli18n-tmp.h:757
msgid "Kyocera FS-1050"
-msgstr ""
+msgstr "Kyocera FS-1050"
#: src/main/xmli18n-tmp.h:758
msgid "Kyocera FS-1200"
-msgstr ""
+msgstr "Kyocera FS-1200"
#: src/main/xmli18n-tmp.h:759
msgid "Kyocera FS-1600"
-msgstr ""
+msgstr "Kyocera FS-1600"
#: src/main/xmli18n-tmp.h:760
msgid "Kyocera FS-1600+"
-msgstr ""
+msgstr "Kyocera FS-1600+"
#: src/main/xmli18n-tmp.h:761
msgid "Kyocera FS-1700"
-msgstr ""
+msgstr "Kyocera FS-1700"
#: src/main/xmli18n-tmp.h:762
msgid "Kyocera FS-1700+"
-msgstr ""
+msgstr "Kyocera FS-1700+"
#: src/main/xmli18n-tmp.h:763
msgid "Kyocera FS-1750"
-msgstr ""
+msgstr "Kyocera FS-1750"
#: src/main/xmli18n-tmp.h:764
msgid "Kyocera FS-1800"
-msgstr ""
+msgstr "Kyocera FS-1800"
#: src/main/xmli18n-tmp.h:765
msgid "Kyocera FS-1800+"
-msgstr ""
+msgstr "Kyocera FS-1800+"
#: src/main/xmli18n-tmp.h:766
msgid "Kyocera FS-1900"
-msgstr ""
+msgstr "Kyocera FS-1900"
#: src/main/xmli18n-tmp.h:767
msgid "Kyocera FS-3500"
-msgstr ""
+msgstr "Kyocera FS-3500"
#: src/main/xmli18n-tmp.h:768
msgid "Kyocera FS-3600"
-msgstr ""
+msgstr "Kyocera FS-3600"
#: src/main/xmli18n-tmp.h:769
msgid "Kyocera FS-3600+"
-msgstr ""
+msgstr "Kyocera FS-3600+"
#: src/main/xmli18n-tmp.h:770
msgid "Kyocera FS-3700"
-msgstr ""
+msgstr "Kyocera FS-3700"
#: src/main/xmli18n-tmp.h:771
msgid "Kyocera FS-3700+"
-msgstr ""
+msgstr "Kyocera FS-3700+"
#: src/main/xmli18n-tmp.h:772
msgid "Kyocera FS-3750"
-msgstr ""
+msgstr "Kyocera FS-3750"
#: src/main/xmli18n-tmp.h:773
msgid "Kyocera FS-3800"
-msgstr ""
+msgstr "Kyocera FS-3800"
#: src/main/xmli18n-tmp.h:774
msgid "Kyocera FS-5800C"
-msgstr ""
+msgstr "Kyocera FS-5800C"
#: src/main/xmli18n-tmp.h:775
msgid "Kyocera FS-5900C"
-msgstr ""
+msgstr "Kyocera FS-5900C"
#: src/main/xmli18n-tmp.h:776
msgid "Kyocera FS-6500"
-msgstr ""
+msgstr "Kyocera FS-6500"
#: src/main/xmli18n-tmp.h:777
msgid "Kyocera FS-6500+"
-msgstr ""
+msgstr "Kyocera FS-6500+"
#: src/main/xmli18n-tmp.h:778
msgid "Kyocera FS-6700"
-msgstr ""
+msgstr "Kyocera FS-6700"
#: src/main/xmli18n-tmp.h:779
msgid "Kyocera FS-7000"
-msgstr ""
+msgstr "Kyocera FS-7000"
#: src/main/xmli18n-tmp.h:780
msgid "Kyocera FS-7000+"
-msgstr ""
+msgstr "Kyocera FS-7000+"
#: src/main/xmli18n-tmp.h:781
msgid "Kyocera FS-8000C"
-msgstr ""
+msgstr "Kyocera FS-8000C"
#: src/main/xmli18n-tmp.h:782
msgid "Kyocera FS-9000"
-msgstr ""
+msgstr "Kyocera FS-9000"
#: src/main/xmli18n-tmp.h:783
msgid "Kyocera FS-9100DN"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
#: src/main/xmli18n-tmp.h:784
msgid "Kyocera FS-9500DN"
-msgstr ""
+msgstr "Kyocera FS-9500DN"
#: src/main/xmli18n-tmp.h:785
msgid "Kyocera KM-1530"
-msgstr ""
+msgstr "Kyocera KM-1530"
#: src/main/xmli18n-tmp.h:786
msgid "Kyocera KM-1810"
-msgstr ""
+msgstr "Kyocera KM-1810"
#: src/main/xmli18n-tmp.h:787
msgid "Kyocera KM-2030"
-msgstr ""
+msgstr "Kyocera KM-2030"
#: src/main/xmli18n-tmp.h:788
msgid "Kyocera KM-2530"
-msgstr ""
+msgstr "Kyocera KM-2530"
#: src/main/xmli18n-tmp.h:789
msgid "Kyocera KM-3530"
-msgstr ""
+msgstr "Kyocera KM-3530"
#: src/main/xmli18n-tmp.h:790
msgid "Kyocera KM-4230"
-msgstr ""
+msgstr "Kyocera KM-4230"
#: src/main/xmli18n-tmp.h:791
msgid "Kyocera KM-4530"
-msgstr ""
+msgstr "Kyocera KM-4530"
#: src/main/xmli18n-tmp.h:792
msgid "Kyocera KM-5230"
-msgstr ""
+msgstr "Kyocera KM-5230"
#: src/main/xmli18n-tmp.h:793
msgid "Kyocera KM-5530"
-msgstr ""
+msgstr "Kyocera KM-5530"
#: src/main/xmli18n-tmp.h:794
msgid "Kyocera KM-6230"
-msgstr ""
+msgstr "Kyocera KM-6230"
#: src/main/xmli18n-tmp.h:795
msgid "Lexmark 4076"
msgstr "Lexmark 4076"
#: src/main/xmli18n-tmp.h:796
-#, fuzzy
msgid "Lexmark Optra E"
-msgstr "Lexmark Z42"
+msgstr "Lexmark Optra E"
#: src/main/xmli18n-tmp.h:797
msgid "Lexmark Optra E+"
-msgstr ""
+msgstr "Lexmark Optra E+"
#: src/main/xmli18n-tmp.h:798
msgid "Lexmark Valuewriter 300"
-msgstr ""
+msgstr "Lexmark Valuewriter 300"
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
-msgstr ""
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
-msgstr ""
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
-msgstr ""
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
-msgstr ""
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
-msgstr ""
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
-msgstr ""
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
-msgstr ""
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
-msgstr ""
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
-msgstr ""
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
-msgstr ""
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
-msgstr ""
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
-msgstr ""
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
#: src/main/xmli18n-tmp.h:811
msgid "Okidata OL400"
-msgstr ""
+msgstr "Okidata OL400"
#: src/main/xmli18n-tmp.h:812
msgid "Okidata OL400e"
-msgstr ""
+msgstr "Okidata OL400e"
#: src/main/xmli18n-tmp.h:813
msgid "Okidata OL400ex"
-msgstr ""
+msgstr "Okidata OL400ex"
#: src/main/xmli18n-tmp.h:814
msgid "Okidata OL410e"
-msgstr ""
+msgstr "Okidata OL410e"
#: src/main/xmli18n-tmp.h:815
msgid "Okidata OL600e"
-msgstr ""
+msgstr "Okidata OL600e"
#: src/main/xmli18n-tmp.h:816
msgid "Okidata OL610e/S"
-msgstr ""
+msgstr "Okidata OL610e/S"
#: src/main/xmli18n-tmp.h:817
msgid "Okidata OL800"
-msgstr ""
+msgstr "Okidata OL800"
#: src/main/xmli18n-tmp.h:818
msgid "Okidata OL810ex"
-msgstr ""
+msgstr "Okidata OL810ex"
#: src/main/xmli18n-tmp.h:819
msgid "Okidata Okipage 6e"
-msgstr ""
+msgstr "Okidata Okipage 6e"
#: src/main/xmli18n-tmp.h:820
msgid "Okidata Okipage 6ex"
-msgstr ""
+msgstr "Okidata Okipage 6ex"
#: src/main/xmli18n-tmp.h:821
msgid "Okidata Okipage 8p"
-msgstr ""
+msgstr "Okidata Okipage 8p"
#: src/main/xmli18n-tmp.h:822
msgid "Okidata Okipage 10e"
-msgstr ""
+msgstr "Okidata Okipage 10e"
#: src/main/xmli18n-tmp.h:823
msgid "Okidata Okipage 10ex"
-msgstr ""
+msgstr "Okidata Okipage 10ex"
#: src/main/xmli18n-tmp.h:824
msgid "Okidata Okipage 14ex"
-msgstr ""
+msgstr "Okidata Okipage 14ex"
#: src/main/xmli18n-tmp.h:825
msgid "Okidata Super 6e"
-msgstr ""
+msgstr "Okidata Super 6e"
#: src/main/xmli18n-tmp.h:826
msgid "Olivetti JP350S"
-msgstr ""
+msgstr "Olivetti JP350S"
#: src/main/xmli18n-tmp.h:827
msgid "Olivetti PG 306"
-msgstr ""
+msgstr "Olivetti PG 306"
#: src/main/xmli18n-tmp.h:828
msgid "PCPI 1030"
-msgstr ""
+msgstr "PCPI 1030"
#: src/main/xmli18n-tmp.h:829
msgid "Panasonic KX-P4410"
-msgstr ""
+msgstr "Panasonic KX-P4410"
#: src/main/xmli18n-tmp.h:830
msgid "Panasonic KX-P4450"
-msgstr ""
+msgstr "Panasonic KX-P4450"
#: src/main/xmli18n-tmp.h:831
msgid "Panasonic KX-P6150"
-msgstr ""
+msgstr "Panasonic KX-P6150"
#: src/main/xmli18n-tmp.h:832
msgid "Panasonic KX-P6500"
-msgstr ""
+msgstr "Panasonic KX-P6500"
#: src/main/xmli18n-tmp.h:833
msgid "Raven LP-410"
-msgstr ""
+msgstr "Raven LP-410"
#: src/main/xmli18n-tmp.h:834
msgid "Ricoh Aficio 220"
-msgstr ""
+msgstr "Ricoh Aficio 220"
#: src/main/xmli18n-tmp.h:835
msgid "Ricoh Aficio 401"
-msgstr ""
+msgstr "Ricoh Aficio 401"
#: src/main/xmli18n-tmp.h:836
msgid "Ricoh Aficio 700"
-msgstr ""
+msgstr "Ricoh Aficio 700"
#: src/main/xmli18n-tmp.h:837
msgid "Samsung ML-85"
-msgstr ""
+msgstr "Samsung ML-85"
#: src/main/xmli18n-tmp.h:838
msgid "Samsung ML-4600"
-msgstr ""
+msgstr "Samsung ML-4600"
#: src/main/xmli18n-tmp.h:839
msgid "Samsung ML-5000a"
-msgstr ""
+msgstr "Samsung ML-5000a"
#: src/main/xmli18n-tmp.h:840
msgid "Samsung ML-6000"
-msgstr ""
+msgstr "Samsung ML-6000"
#: src/main/xmli18n-tmp.h:841
msgid "Samsung ML-6100"
-msgstr ""
+msgstr "Samsung ML-6100"
#: src/main/xmli18n-tmp.h:842
msgid "Samsung ML-7000"
-msgstr ""
+msgstr "Samsung ML-7000"
#: src/main/xmli18n-tmp.h:843
msgid "Samsung ML-7000N"
-msgstr ""
+msgstr "Samsung ML-7000N"
#: src/main/xmli18n-tmp.h:844
msgid "Samsung ML-7000P"
-msgstr ""
+msgstr "Samsung ML-7000P"
#: src/main/xmli18n-tmp.h:845
msgid "Samsung ML-7050"
-msgstr ""
+msgstr "Samsung ML-7050"
#: src/main/xmli18n-tmp.h:846
msgid "Samsung QL-5100A"
-msgstr ""
+msgstr "Samsung QL-5100A"
#: src/main/xmli18n-tmp.h:847
msgid "Samsung QL-6050"
-msgstr ""
+msgstr "Samsung QL-6050"
#: src/main/xmli18n-tmp.h:848
msgid "Seiko SpeedJET 200"
-msgstr ""
+msgstr "Seiko SpeedJET 200"
#: src/main/xmli18n-tmp.h:849
msgid "Sharp AR-161"
-msgstr ""
+msgstr "Sharp AR-161"
#: src/main/xmli18n-tmp.h:850
-#, fuzzy
msgid "Sony IJP-V100"
-msgstr "Sony UP-DP10"
+msgstr "Sony IJP-V100"
#: src/main/xmli18n-tmp.h:851
msgid "Star LS-04"
-msgstr ""
+msgstr "Star LS-04"
#: src/main/xmli18n-tmp.h:852
-#, fuzzy
msgid "Star LaserPrinter 8"
-msgstr "Nyomtató beállítása"
+msgstr "Star LaserPrinter 8"
#: src/main/xmli18n-tmp.h:853
msgid "Tally MT908"
-msgstr ""
+msgstr "Tally MT908"
#: src/main/xmli18n-tmp.h:854
msgid "Xerox Able 1406"
-msgstr ""
+msgstr "Xerox Able 1406"
#: src/main/xmli18n-tmp.h:855
msgid "Xerox DocuPrint 4508"
-msgstr ""
+msgstr "Xerox DocuPrint 4508"
#: src/main/xmli18n-tmp.h:856
msgid "Xerox DocuPrint C20"
-msgstr ""
+msgstr "Xerox DocuPrint C20"
#: src/main/xmli18n-tmp.h:857
msgid "Xerox DocuPrint N4512"
-msgstr ""
+msgstr "Xerox DocuPrint N4512"
#: src/main/xmli18n-tmp.h:858
msgid "Xerox DocuPrint N4512PS"
-msgstr ""
+msgstr "Xerox DocuPrint N4512PS"
#: src/main/xmli18n-tmp.h:859
msgid "Xerox DocuPrint P12"
-msgstr ""
+msgstr "Xerox DocuPrint P12"
#: src/main/xmli18n-tmp.h:860
msgid "Xerox DocuPrint P1202"
-msgstr ""
+msgstr "Xerox DocuPrint P1202"
#: src/main/xmli18n-tmp.h:861
msgid "Xerox DocuPrint P8e"
-msgstr ""
+msgstr "Xerox DocuPrint P8e"
#: src/main/xmli18n-tmp.h:862
msgid "Xerox Document Centre 400"
-msgstr ""
+msgstr "Xerox Document Centre 400"
#: src/main/xmli18n-tmp.h:863
msgid "Lexmark Z42"
@@ -6184,123 +5705,100 @@ msgid "Lexmark Z53"
msgstr "Lexmark Z53"
#: src/main/xmli18n-tmp.h:867
-#, fuzzy
msgid "Olympus P-10"
-msgstr "Olympus P10"
+msgstr "Olympus P-10"
#: src/main/xmli18n-tmp.h:868
-#, fuzzy
msgid "Olympus P-11"
-msgstr "Olympus P10"
+msgstr "Olympus P-11"
#: src/main/xmli18n-tmp.h:869
-#, fuzzy
msgid "Olympus P-200"
-msgstr "Olympus P200"
+msgstr "Olympus P-200"
#: src/main/xmli18n-tmp.h:870
-#, fuzzy
msgid "Olympus P-300"
-msgstr "Olympus P300"
+msgstr "Olympus P-300"
#: src/main/xmli18n-tmp.h:871
-#, fuzzy
msgid "Olympus P-300E"
-msgstr "Olympus P300"
+msgstr "Olympus P-300E"
#: src/main/xmli18n-tmp.h:872
-#, fuzzy
msgid "Olympus P-300U"
-msgstr "Olympus P300"
+msgstr "Olympus P-300U"
#: src/main/xmli18n-tmp.h:873
-#, fuzzy
msgid "Olympus P-330E"
-msgstr "Olympus P300"
+msgstr "Olympus P-330E"
#: src/main/xmli18n-tmp.h:874
-#, fuzzy
msgid "Olympus P-330NE"
-msgstr "Olympus P300"
+msgstr "Olympus P-330NE"
#: src/main/xmli18n-tmp.h:875
-#, fuzzy
msgid "Olympus P-400"
-msgstr "Olympus P400"
+msgstr "Olympus P-400"
#: src/main/xmli18n-tmp.h:876
-#, fuzzy
msgid "Olympus P-440"
-msgstr "Olympus P440"
+msgstr "Olympus P-440"
#: src/main/xmli18n-tmp.h:877
-#, fuzzy
msgid "Canon CP-100"
-msgstr "Canon CP100"
+msgstr "Canon CP-100"
#: src/main/xmli18n-tmp.h:878
-#, fuzzy
msgid "Canon CP-200"
-msgstr "Canon CP220"
+msgstr "Canon CP-200"
#: src/main/xmli18n-tmp.h:879
-#, fuzzy
msgid "Canon CP-220"
-msgstr "Canon CP220"
+msgstr "Canon CP-220"
#: src/main/xmli18n-tmp.h:880
-#, fuzzy
msgid "Canon CP-300"
-msgstr "Canon CP100"
+msgstr "Canon CP-300"
#: src/main/xmli18n-tmp.h:881
-#, fuzzy
msgid "Canon CP-330"
-msgstr "Canon CP100"
+msgstr "Canon CP-330"
#: src/main/xmli18n-tmp.h:882
-#, fuzzy
msgid "Canon SELPHY-CP-400"
-msgstr "Canon S400"
+msgstr "Canon SELPHY-CP-400"
#: src/main/xmli18n-tmp.h:883
-#, fuzzy
msgid "Canon SELPHY-CP-500"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-500"
#: src/main/xmli18n-tmp.h:884
-#, fuzzy
msgid "Canon SELPHY-CP-510"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-510"
#: src/main/xmli18n-tmp.h:885
-#, fuzzy
msgid "Canon SELPHY-CP-600"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-600"
#: src/main/xmli18n-tmp.h:886
-#, fuzzy
msgid "Canon SELPHY-CP-710"
-msgstr "Canon CP100"
+msgstr "Canon SELPHY-CP-710"
#: src/main/xmli18n-tmp.h:887
msgid "Sony UP-DP10"
msgstr "Sony UP-DP10"
#: src/main/xmli18n-tmp.h:888
-#, fuzzy
msgid "Sony UP-DR150"
-msgstr "Sony UP-DP10"
+msgstr "Sony UP-DR150"
#: src/main/xmli18n-tmp.h:889
-#, fuzzy
msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix CX-400"
+msgstr "Fujifilm Printpix-CX-400"
#: src/main/xmli18n-tmp.h:890
-#, fuzzy
msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix CX-550"
+msgstr "Fujifilm Printpix-CX-550"
#: src/main/xmli18n-tmp.h:891
msgid "RAW DATA 16 bit"
@@ -6480,7 +5978,7 @@ msgstr "Minden papírméret mutatása"
msgid "Dimensions:"
msgstr "Méretek:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Szélesség:"
@@ -6489,7 +5987,7 @@ msgstr "Szélesség:"
msgid "Width of the paper that you wish to print to"
msgstr "A nyomtatáshoz használt papír szélessége"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Magasság:"
@@ -6759,21 +6257,21 @@ msgstr ""
"Adja meg annak a nyomtatónak a nevét (ne a gyártmányt vagy a modellt), "
"amelyikre nyomtatni kíván"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Nyomtató beállítása..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr "A nyomtatómodell, a PPD-fájl és a nyomtatást végző parancs megadása"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Új nyomtató..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6781,23 +6279,23 @@ msgstr ""
"Új logikai nyomtató felvétele. Egy olyan beállítási állapot elnevezésére "
"használható, amelyet a jövőben is kíván használni."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
msgstr "Képméret"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Méretezés:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Megadja a kép méretezését (méretét)"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr "Méretezés:"
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6805,31 +6303,31 @@ msgstr ""
"Megadja, hogy a méretezés a lapméret százalékában legyen-e mérve vagy a "
"kimeneti pont/hüvelyk értékben"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Százalék"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Nyomat méretezése a lap mérete szerint"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Nyomat méretezése pont/hüvelyk érték szerint"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "A nyomat szélessége"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "A nyomat magassága"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6837,66 +6335,66 @@ msgstr ""
"Eredeti képméret\n"
"használata"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "A nyomat méretének beállítása a kép méretére"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Nyomat színeinek beállítása"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Alapértelmezések beállítása"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Bezárás"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Előnézeti kép"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr "Kimeneti csatornák megjelenítése:"
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr "Kimenet"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Kimenet típusa:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Válassza ki a kívánt kimeneti típust"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Kimenet beállítása..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Színegyensúly, fényesség, kontraszt, telítettség és a színszórási módszer "
"beállítása"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
msgstr "Mértékegységek:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
msgstr " "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Mértékegységek:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet"
@@ -7013,28 +6511,27 @@ msgstr "4. extra"
msgid "Extra 5"
msgstr "5. extra"
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-msgid "Gutenprint"
-msgstr "Gutenprint"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Hungarian"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin2"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr "Nem"
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr "Igen"
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr "Finomhangolás"
@@ -7043,14 +6540,13 @@ msgid "Escputil version "
msgstr "Escputil verzió "
#: src/escputil/escputil.c:71
-#, fuzzy
msgid ""
", Copyright (C) 2000-2006 Robert Krawitz\n"
"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; type 'escputil -l' for details.\n"
msgstr ""
-", Copyright (C) 2000-2003 Robert Krawitz\n"
+", Copyright (C) 2000-2006 Robert Krawitz\n"
"Az Escputil-ra NINCS GARANCIA, a részletekért adja ki a következő "
"parancsot:\n"
" 'escputil -l'\n"
@@ -7059,7 +6555,6 @@ msgstr ""
"a részletekért adja ki a következő parancsot: 'escputil -l'.\n"
#: src/escputil/escputil.c:76
-#, fuzzy
msgid ""
"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
@@ -7077,12 +6572,7 @@ msgid ""
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001, Michael Sweet, Robert Krawitz\n"
-"és a Gutenprint fejlesztőcsapat többi tagja.\n"
-"\n"
-"A szerzők weblapja: http://gimp-print.sourceforge.net\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
"Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
"a Free Software Foundation által publikált GNU General Public\n"
@@ -7201,12 +6691,12 @@ msgstr "Csak egy nyomtatótípust adhat meg."
#: src/escputil/escputil.c:369
#, c-format
msgid "Alignment choices must be at least 1."
-msgstr ""
+msgstr "Az igazítási választások értéke legalább 1 kell legyen."
#: src/escputil/escputil.c:376
#, c-format
msgid "Alignment passes must be at least 1."
-msgstr ""
+msgstr "Az igazítási lépések értéke legallább 1 kell legyen."
#: src/escputil/escputil.c:381
#, c-format
@@ -7253,19 +6743,23 @@ msgstr "Az olvasás a nyomtatóról túllépte az időkorlátot\n"
msgid "Cannot read from %s: %s\n"
msgstr "Nem lehet olvasni a következőről: %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "A(z) %s nem nyitható meg írásra/olvasásra: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "A(z) %s nem írható: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7274,7 +6768,7 @@ msgstr ""
"\n"
"A(z) %s nem írható: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7285,225 +6779,225 @@ msgstr ""
"Nem lehet felismerni a nyomtató típusát.\n"
"Használja az -m kapcsolót a nyomtató típusának megadásához.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr "Ismeretlen"
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
-msgstr ""
+msgstr "Ãllapot: Hiba\n"
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
-msgstr ""
+msgstr "Ãllapot: Önálló nyomtatás\n"
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
-msgstr ""
+msgstr "Ãllapot: Foglalt\n"
-#: src/escputil/escputil.c:1020
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1036
+#, c-format
msgid "Status: Waiting\n"
-msgstr "Telítettség"
+msgstr "Ãllapot: Várakozás\n"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
-msgstr ""
+msgstr "Ãllapot: Tétlen\n"
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
-msgstr ""
+msgstr "Ãllapot: Szünetel\n"
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
-msgstr ""
+msgstr "Ãllapot: Tisztítás\n"
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
-msgstr ""
+msgstr "Ãllapot: Gyári szállítás\n"
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
-msgstr ""
+msgstr "Ãllapot: Leállítás\n"
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
-msgstr ""
+msgstr "Ãllapot: Ismeretlen (%d)\n"
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
-msgstr ""
+msgstr "Hiba: Végzetes hiba\n"
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
-msgstr ""
+msgstr "Hiba: Másik csatoló van kiválasztva\n"
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
-msgstr ""
+msgstr "Hiba: A fedél nyitva\n"
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
-msgstr ""
+msgstr "Hiba: A papír elakadt\n"
-#: src/escputil/escputil.c:1061
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1077
+#, c-format
msgid "Error: Ink out\n"
-msgstr "Hiba a bemenetben\n"
+msgstr "Hiba: Elfogyott a tinta\n"
-#: src/escputil/escputil.c:1064
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1080
+#, c-format
msgid "Error: Paper out\n"
-msgstr "Hiba a bemenetben\n"
+msgstr "Hiba: Elfogyott a papír\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
-msgstr ""
+msgstr "Hiba: Várakozás visszatérésre a letépési pozícióból\n"
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
-msgstr ""
+msgstr "Hiba: Dupla lapadagoló hiba\n"
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
-msgstr ""
+msgstr "Hiba: Helyreállíthatatlan vágóhiba\n"
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
-msgstr ""
+msgstr "Hiba: Helyreállítható vágóelakadás\n"
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
-msgstr ""
+msgstr "Hiba: A CD tálca kint\n"
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
-msgstr ""
+msgstr "Hiba: Kártyabetöltési hiba\n"
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
-msgstr ""
+msgstr "Hiba: A tálcafedél nyitva\n"
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
-msgstr ""
+msgstr "Hiba: Ismeretlen (%d)\n"
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
-msgstr ""
+msgstr "Fúvóka önteszt nyomtatása\n"
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#, c-format
msgid "Ink Levels:\n"
-msgstr "tintaszintek"
+msgstr "Tintaszintek:\n"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Tinta színe"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Hátralevő százalék"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
-msgstr ""
+msgstr "Figyelmeztetés: Kevés a fekete tinta\n"
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
-msgstr ""
+msgstr "Figyelmeztetés: Ismeretlen (%d)\n"
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
-msgstr ""
+msgstr "Feladat neve: "
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr "tintaszintek"
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr "állapot"
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "A(z) %s lekérése nyers eszközt igényel.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "A kiterjesztett tintaadatok lekérése nyers eszközt igényel.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr "Rész száma"
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr "Dátum"
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "A nyomtatóazonosítás nyers eszközt igényel.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, c-format
msgid "Cannot identify printer model.\n"
msgstr "A nyomtatótípus nem azonosítható.\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Fejek tisztítása...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
"Fúvókateszt futtatása, győződjön meg róla, hogy van papír a nyomtatóban.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7542,7 +7036,7 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7578,17 +7072,17 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Nem lehet elküldeni a parancsot a nyomtatóra, kilépés.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
-msgstr ""
+msgstr "Kilépés\n"
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7607,20 +7101,20 @@ msgstr ""
"Ezután a program a válasz megerősítését fogja kérni.\n"
"Mit szeretne tenni (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
"A \"q\" betű lenyomásával erősítse meg hogy mentés nélkül kíván kilépni:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7630,7 +7124,7 @@ msgstr ""
"Ha menteni kívánja az igazítást, akkor meg kell ismételnie ezt a "
"folyamatot.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7639,12 +7133,12 @@ msgstr ""
"Az \"r\" betű lenyomásával erősítse meg, hogy meg kívánja ismételni az "
"igazítási folyamatot:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Az igazítási folyamat megismétlése.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7654,17 +7148,17 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "A beállítások mentése..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "meghiúsult!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7672,27 +7166,27 @@ msgid ""
msgstr ""
"A beállítások mentése meghiúsult. Ismételje meg az igazítási folyamatot.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "sikerült!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Az igazítási beállítások mentése a nyomtatóra sikeres.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Azonosítatlan parancs.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Az utolsó parancsot nem erősítette meg.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7703,12 +7197,12 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Üssön enter-t a folytatáshoz > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7720,42 +7214,42 @@ msgstr ""
"Adjon meg egy párszámot, a ?-et segítségért vagy az r-et a folyamat "
"megismétléséhez.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "#%d. menet"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Helyezzen be egy üres lapot.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "A szám kívül esik a tartományon!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Nem értelmezhető, amit írt!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "A legjobb sorpár száma 1 és %d között kell legyen.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Kísérlet az igazítás beállítására..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "sikeres.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7764,7 +7258,7 @@ msgid ""
"quality printing.\n"
msgstr ""
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Hiba a bemenetben\n"
@@ -7773,7 +7267,7 @@ msgstr "Hiba a bemenetben\n"
msgid "Printing..."
msgstr "Nyomtatás..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Fájl/Nyomtatás..."
@@ -7789,17 +7283,17 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "HIBA: ijsgutenprint: Hibás színtér: bps: %d, csatorna: %d, tér: %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "HIBA: ijsgutenprint: Nincs sorpuffer\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
@@ -7807,171 +7301,96 @@ msgstr ""
"HIBA: ijsgutenprint: A(z) %s=%s paraméter nem dolgozható fel (a rendszer egy "
"számot várt)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr ""
"HIBA: ijsgutenprint: A nyomtatót a -sDeviceModel paranccsal kell megadni\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "HIBA: ijsgutenprint: A(z) %s nyomtató egy ismeretlen típus\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr "ijsgutenprint: ismeretlen DeviceModel: %s\n"
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "HIBA: ijsgutenprint: a TopLeft %s értéke nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "HIBA: ijsgutenprint: a PaperSize %s értéke nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "HIBA: ijsgutenprint: a(z) %s görbe nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "HIBA: ijsgutenprint: a(z) %s lebegőpontos %s nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "HIBA: ijsgutenprint: a(z) %s egész %s nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "HIBA: ijsgutenprint: a(z) %s %s mérete nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "HIBA: ijsgutenprint: a(z) %s logikai %s nem dolgozható fel\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "HIBA: ijsgutenprint: Hibás paraméter: %s %d\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "HIBA: ijsgutenprint: hibás billentyűkód: %d\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "HIBA: ijsgutenprint: image_init meghiúsult %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "HIBA: ijsgutenprint: A következő fájlleíró nem nyitható meg: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "HIBA: ijsgutenprint: Nem lehet megnyitni a(z) %s-t: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "HIBA: ijsgutenprint: Ismeretlen nyomtató: %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "HIBA: ijsgutenprint: Hibás paraméterek, nem lehet folytatni!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "HIBA: ijsgutenprint: A következő sor lekérése meghiúsult itt: %.0f\n"
-#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "HIBA: ijsgutenprint: ijs_server_get_page_header meghiúsult: %d\n"
-
-#~ msgid "Red and Blue Ink Usage"
-#~ msgstr "Vörös és két tinta használata"
-
-#~ msgid "Amount of red and blue ink to use"
-#~ msgstr "A használandó vörös és kék tinta mennyisége"
-
-#~ msgid "Canon BJC 4400 photo"
-#~ msgstr "Canon BJC 4400 fotó"
-
-#~ msgid "EPSON Stylus Photo 785EPX"
-#~ msgstr "EPSON Stylus Photo 785EPX"
-
-#~ msgid "EPSON CL-700"
-#~ msgstr "EPSON CL-700"
-
-#~ msgid "EPSON CL-750"
-#~ msgstr "EPSON CL-750"
-
-#~ msgid "EPSON CL-760"
-#~ msgstr "EPSON CL-760"
-
-#~ msgid "EPSON MC-2000"
-#~ msgstr "EPSON MC-2000"
-
-#~ msgid "EPSON MC-7000"
-#~ msgstr "EPSON MC-7000"
-
-#~ msgid "EPSON MC-10000"
-#~ msgstr "EPSON MC-10000"
-
-#~ msgid "EPSON MJ-6000C"
-#~ msgstr "EPSON MJ-6000C"
-
-#~ msgid "HP DeskJet 600/600C"
-#~ msgstr "HP DeskJet 600/600C"
-
-#~ msgid "HP DeskJet 600 series"
-#~ msgstr "HP DeskJet 600 series"
-
-#~ msgid "HP DeskJet 690 series"
-#~ msgstr "HP DeskJet 690 series"
-
-#~ msgid "HP DeskJet 900 series"
-#~ msgstr "HP DeskJet 900 sorozat"
-
-#~ msgid "HP DeskJet 2000 series"
-#~ msgstr "HP DeskJet 2000 sorozat"
-
-#~ msgid "HP DeskJet 2500 series"
-#~ msgstr "HP DeskJet 2500 sorozat"
-
-#~ msgid "HP LaserJet II series"
-#~ msgstr "HP LaserJet II sorozat"
-
-#~ msgid "HP LaserJet III series"
-#~ msgstr "HP LaserJet III sorozat"
-
-#~ msgid "HP LaserJet 4 series"
-#~ msgstr "HP LaserJet 4 sorozat"
-
-#~ msgid "HP LaserJet 5 series"
-#~ msgstr "HP LaserJet 5 sorozat"
-
-#~ msgid "HP LaserJet 6 series"
-#~ msgstr "HP LaserJet 6 sorozat"
-
-#~ msgid "unknown"
-#~ msgstr "ismeretlen"
-
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "A nyomtató nem azonosítható\n"
-
-#~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "A nyomtató nem támogatja a tintatípusok felsorolását.\n"
+#~ msgid "Gutenprint"
+#~ msgstr "Gutenprint"
diff --git a/po/ja.gmo b/po/ja.gmo
index aa86ffc..db72bc1 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ja.po b/po/ja.po
index 8e309b2..bb5e066 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimp-print Version 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2002-10-07 19:10+0900\n"
"Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -14,8 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "½é´üÃͤËÌ᤹"
@@ -29,70 +31,73 @@ msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
msgid "Hybrid EvenTone"
msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "¥ì¥¿¡¼"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ŭ±þ½ç½øÊý¼°"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "¹â®Êý¼°"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Ķ¹â®Êý¼°"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Ç»ÅÙ:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -102,15 +107,15 @@ msgstr ""
"ÍÑ»æ¤ËÂçÎ̤Υ¤¥ó¥¯¤¬ÉÕ¤¤¤¿¤ê±ø¤ì¤¿¤ê¤¹¤ë¾ì¹ç¤ÏÇ»ÅÙ¤òÄ㤯¤·¤Æ²¼¤µ¤¤;\n"
"¹õ¤ÎÉôʬ¤¬¤Þ¤Ð¤é¤Ë¤Ê¤ë¾ì¹ç¤ÏÇ»ÅÙ¤ò¹â¤¯¤·¤Æ²¼¤µ¤¤¡£"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "¥Ç¥£¥¶Êý¼°"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
#, fuzzy
msgid ""
"Choose the dither algorithm to be used.\n"
@@ -357,7 +362,7 @@ msgstr "¤½¤Î¾"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "²èÁü¤Î¥µ¥¤¥º"
@@ -373,61 +378,61 @@ msgstr "²èÁü¤Î¥µ¥¤¥º"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "ÍÑ»æ¤Î¼ïÎà"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "µë»æÊýË¡"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "²òÁüÅÙ"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
@@ -435,22 +440,22 @@ msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -460,13 +465,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
@@ -475,97 +480,97 @@ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "ColorLife Paper"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Ç»ÅÙ:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "¥Þ¥¼¥ó¥¿ (M)"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Ç»ÅÙ:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Ç»ÅÙ:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
@@ -575,13 +580,13 @@ msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
msgid "Light Yellow Transition"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -623,28 +628,28 @@ msgid "CMY Color"
msgstr "CMY ¿§"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "¹õ¿§"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "¥«¥é¡¼"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "¹õ¤ÈÇò"
@@ -845,15 +850,15 @@ msgstr "¥¬¥ó¥Þ:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "¥·¥¢¥ó (C)"
@@ -862,15 +867,15 @@ msgstr "¥·¥¢¥ó (C)"
msgid "Adjust the cyan gamma"
msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "¥Þ¥¼¥ó¥¿ (M)"
@@ -879,15 +884,15 @@ msgstr "¥Þ¥¼¥ó¥¿ (M)"
msgid "Adjust the magenta gamma"
msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "²«¿§ (Y)"
@@ -896,10 +901,10 @@ msgstr "²«¿§ (Y)"
msgid "Adjust the yellow gamma"
msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -908,7 +913,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -918,10 +923,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1251,173 +1256,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "ɸ½à"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "¥í¡¼¥ë¼°µë»æ"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "¼êÆ°"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "¼êÆ°"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "¼êÆ°"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "¥È¥ì¥¤"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "¥Õ¥©¥ÈÍÑ»æ"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "¼«Æ°ÁªÂò"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "¹â¤µ:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "¼Ì¿¿"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Six Color Photo"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "¹õ¿§"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "²«¿§ (Y)"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "¥Õ¥©¥ÈÍÑ»æ"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "¹õ¿§"
@@ -1605,138 +1610,139 @@ msgstr ""
msgid "Adjust the red map"
msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Ç»ÅÙ:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Ç»ÅÙ:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "½ÐÎϤμïÎà:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "½ÐÎϤμïÎà:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "²èÁü¤Î¥µ¥¤¥º"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 DPI Unidirectional"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 DPI Unidirectional"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1896,8 +1902,8 @@ msgstr "Ilford Heavy Paper"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2020,24 +2026,24 @@ msgstr "600x600 DPI ¥â¥Î¥¯¥í"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "PPD ¥Õ¥¡¥¤¥ë:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5833,51 +5839,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6386,7 +6392,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "À£Ë¡:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Éý:"
@@ -6395,7 +6401,7 @@ msgstr "Éý:"
msgid "Width of the paper that you wish to print to"
msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "¹â¤µ:"
@@ -6674,21 +6680,21 @@ msgid ""
"wish to print to"
msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6696,24 +6702,24 @@ msgstr ""
"¿·µ¬¤ËÏÀÍý¥×¥ê¥ó¥¿¤òÄêµÁ¤·¤Þ¤¹¡£¤³¤ì¤Ï¼¡²ó»ÈÍѤ¹¤ë¤¿¤á¤Ë³Ð¤¨¤Æ¤ª¤­¤¿¤¤ÀßÄê̾"
"¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "²èÁü¤Î¥µ¥¤¥º"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "³ÈÂç½Ì¾®:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6721,31 +6727,31 @@ msgstr ""
"³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª"
"Âò¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "ÈæΨ"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6753,68 +6759,68 @@ msgstr ""
"¥ª¥ê¥¸¥Ê¥ë¤Î\n"
"¥µ¥¤¥º¤ÎÍøÍÑ"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "°õºþ¥«¥é¡¼Ä´À°"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "½é´üÃͤËÌ᤹"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "ÊĤ¸¤ë"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "½ÐÎϤμïÎà:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "½ÐÎϤμïÎà:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "½ÐÎϤÎÄ´À°..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "ñ°Ì:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "ñ°Ì:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£"
@@ -6941,29 +6947,27 @@ msgstr "¥È¥ì¥¤£´"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "¥Æ¥¹¥È°õºþ"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Japanese"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISO ¥é¥Æ¥ó£±"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7252,19 +7256,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7273,7 +7281,7 @@ msgstr ""
"\n"
"%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7284,226 +7292,226 @@ msgstr ""
"¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "ºÌÅÙ:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "ÆþÎÏ¥¨¥é¡¼\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "ÆþÎÏ¥¨¥é¡¼\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "¥¤¥ó¥¯¤Î¿§"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "»Ä¤ê¤Î³ä¹ç"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
"¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
"²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7579,7 +7587,7 @@ msgstr ""
"¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7645,17 +7653,17 @@ msgstr ""
"¤µ¤¤¡£\n"
"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7674,19 +7682,19 @@ msgstr ""
"ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
"ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7695,19 +7703,19 @@ msgstr ""
"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
"¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7723,17 +7731,17 @@ msgstr ""
"¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
"\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "¼ºÇԤǤ¹¡ª\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7742,27 +7750,27 @@ msgstr ""
"¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
"ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7779,12 +7787,12 @@ msgstr ""
"°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
"ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7795,42 +7803,42 @@ msgstr ""
"¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
"¤¹¡£\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "¥Ñ¥¹ #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "´Ö³ÖÊäÀµÃæ..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7843,7 +7851,7 @@ msgstr ""
"¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
"ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "ÆþÎÏ¥¨¥é¡¼\n"
@@ -7852,7 +7860,7 @@ msgstr "ÆþÎÏ¥¨¥é¡¼\n"
msgid "Printing..."
msgstr "°õºþÃæ..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/File/°õºþ..."
@@ -7868,113 +7876,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "¤ª¤«¤·¤Ê¥«¥é¡¼¶õ´Ö: bps %d ¥Á¥ã¥ó¥Í¥ë %d ¶õ´Ö %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Äã¥ì¥Ù¥ë¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "¥Ñ¥é¥á¡¼¥¿ %s=%s (¤ª¤½¤é¤¯¿ôÃÍ) ¤ò²òÀϤǤ­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "¥×¥ê¥ó¥¿¤ò -s·¿¼° ¤ò»È¤Ã¤Æ»ØÄꤷ¤Æ²¼¤µ¤¤\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤ÏÉÔÌÀ¤Ê·¿¼°¤Ç¤¹\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init ¤Ë¼ºÇÔ %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥¹¥¯¥ê¥×¥¿¤ò³«¤±¤Þ¤»¤ó: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "%s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "¤ª¤«¤·¤Ê¥Ñ¥é¥á¡¼¥¿; ³¹Ô¤Ç¤­¤Þ¤»¤ó¡ª\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "¥Æ¥¹¥È°õºþ"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "ijs_server_get_page_header ¤Ë¼ºÇÔ %d\n"
@@ -8286,9 +8298,6 @@ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
#~ msgid "Red Balance"
#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
diff --git a/po/nb.gmo b/po/nb.gmo
index d67af8c..901d872 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
Binary files differ
diff --git a/po/nb.po b/po/nb.po
index 09119df..0dae2d7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimp-print 0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2002-07-01 19:36+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian/Bokmaal <no@li.org>\n"
@@ -14,8 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Sett til standardverdier"
@@ -28,83 +30,86 @@ msgstr ""
msgid "Hybrid EvenTone"
msgstr ""
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Letter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
msgstr ""
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
msgid "UniTone"
msgstr ""
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr ""
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordnet"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Rask"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Meget rask"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr ""
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Tetthet:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
"regions are not solid."
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Dither-algoritme"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -343,7 +348,7 @@ msgstr "Annet"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Størrelse"
@@ -359,60 +364,60 @@ msgstr "Størrelse"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Innstillinger for parametere"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Bredde på papiret du skal skrive ut på"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Medietype"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Mediekilde"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr ""
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Oppløsning"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Oppløsning og kvalitet på utskriften"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Blekktype"
@@ -420,22 +425,22 @@ msgstr "Blekktype"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Type blekk i skriveren"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -445,13 +450,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Raskt heltall"
@@ -460,93 +465,93 @@ msgstr "Raskt heltall"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Vanlig papir"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Tetthet:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
msgstr ""
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
msgstr ""
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Tetthet:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
msgstr ""
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Tetthet:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
msgstr ""
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Lys cyan"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Lys magenta"
@@ -556,13 +561,13 @@ msgstr "Lys magenta"
msgid "Light Yellow Transition"
msgstr "Lys cyan"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -604,28 +609,28 @@ msgid "CMY Color"
msgstr "CMY-farge"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Sort"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Farger"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Sort-hvitt"
@@ -822,15 +827,15 @@ msgstr "Gamma:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyan"
@@ -838,15 +843,15 @@ msgstr "Cyan"
msgid "Adjust the cyan gamma"
msgstr ""
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -854,15 +859,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr ""
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Gul"
@@ -870,10 +875,10 @@ msgstr "Gul"
msgid "Adjust the yellow gamma"
msgstr ""
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -881,7 +886,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr ""
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -890,10 +895,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr ""
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1216,173 +1221,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr ""
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Manuell"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Skriv ut til fil?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Manuell"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Manuell"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Skuff"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Fotopapir"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "Autovelg"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Høyde:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Fotografi"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "Lys cyan"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Lys magenta"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Sort"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Gul"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Matt papir"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Fotopapir"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Glanset film"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Sort"
@@ -1564,133 +1569,134 @@ msgstr ""
msgid "Adjust the red map"
msgstr ""
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Tetthet:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
msgstr ""
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Tetthet:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
msgstr ""
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Glanset film"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
msgstr ""
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Lys cyan"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Lys cyan"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Lys cyan"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Lys cyan"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Utskriftstype:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Skriv ut til fil?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Utskriftstype:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Størrelse"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr ""
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
msgstr ""
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Skriver støtter ikke fargeutskrift\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1850,8 +1856,8 @@ msgstr ""
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -1970,24 +1976,24 @@ msgstr "600x600 DPI monokrom"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "PPD fil:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5782,51 +5788,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6326,7 +6332,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Størrelse:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Bredde:"
@@ -6335,7 +6341,7 @@ msgstr "Bredde:"
msgid "Width of the paper that you wish to print to"
msgstr "Bredde på papiret du skal skrive ut på"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Høyde:"
@@ -6592,74 +6598,74 @@ msgid ""
"wish to print to"
msgstr ""
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Sett opp skriver..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr ""
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Ny skriver..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr ""
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Størrelse"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Skalering"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Sett skalering (størrelse) på bildet"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Prosent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Skaler utskriften til størrelsen på papiret"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Skaler utskriften til antall punkter per tomme"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Sett bredde på utskriften"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Sett høyde for utskriften"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6667,67 +6673,67 @@ msgstr ""
"Bruk opprinnelig\n"
"bildestørrelse"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr ""
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Sett til standardverdier"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Lukk"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Forhåndsvisning av bilde"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Utskriftstype:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Utskriftstype:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Velg ønsket type for utdata"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Juster utskrift..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Enheter:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr ">"
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Enheter:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Velg basis måleenhet for utskrift"
@@ -6854,29 +6860,27 @@ msgstr "Skuff 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "testutskrift"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Norwegian"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7066,19 +7070,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Kan ikke lese fra %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Skriverstatus krever bruk av en rå enhet.\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Kan ikke skrive til %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7087,7 +7095,7 @@ msgstr ""
"\n"
"Kan ikke skrive til %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7098,224 +7106,224 @@ msgstr ""
"Kan ikke finne skrivertype.\n"
"Vennligst bruk -m for å spesifisere din skrivermodell.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Metning:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "Feil i inndata\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "Feil i inndata\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Blekkfarge"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Prosent gjenstående"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Du kan kun oppgi én skrivermodell."
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Renser hoder...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7354,7 +7362,7 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7390,17 +7398,17 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Kan ikke sende kommando til skriveren, avslutter.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7412,20 +7420,20 @@ msgid ""
"What do you want to do (s, q, r)?\n"
msgstr ""
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr ">"
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
"Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7434,7 +7442,7 @@ msgstr ""
"OK, skriveren er justert, men justeringen er ikke lagret.\n"
"Hvis du ønsker å lagre justeringen må d\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7443,12 +7451,12 @@ msgstr ""
"Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
"skrive «r»:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Gjentar justeringsprosessen.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7458,44 +7466,44 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "I ferd med å lagre innstillinger..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "feilet!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "fullført!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Innstillingene for justering er lagret til skriveren.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Kommandoen ble ikke gjenkjent.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Siste kommando ble ikke bekreftet.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7506,12 +7514,12 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Trykk linjeskift for å fortsette > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7519,42 +7527,42 @@ msgid ""
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Gjennomgang #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Vennligst sett inn et nytt ark.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Tallet er utenfor gyldig område!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Kan ikke forstå det du skrev inn!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr ""
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Prøver å sette justering..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "fullført.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7563,7 +7571,7 @@ msgid ""
"quality printing.\n"
msgstr ""
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Feil i inndata\n"
@@ -7572,7 +7580,7 @@ msgstr "Feil i inndata\n"
msgid "Printing..."
msgstr "Skriver ut..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Fil/Skriv ut..."
@@ -7588,113 +7596,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "Ugyldige parametere; kan ikke fortsette!\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Ingen rad for buffer\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Ugyldige parametere; kan ikke fortsette!\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "Skriver %s er ikke en kjent modell\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Kan ikke skrive til skriver %s med %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Ukjent skriver %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Henting av neste rad feilet ved %.0f\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init feilet %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Kan ikke åpne fildeskriptor: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Kan ikke åpne %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Ukjent skriver %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "Ugyldige parametere; kan ikke fortsette!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Henting av neste rad feilet ved %.0f\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "testutskrift"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "Henting av neste rad feilet ved %.0f\n"
@@ -8006,9 +8018,6 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
#~ msgid "Red Balance"
#~ msgstr "Gul"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Skriverstatus krever bruk av en rå enhet.\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "Gul"
diff --git a/po/nl.gmo b/po/nl.gmo
index 7c64191..49e7773 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index e0e4299..d5f241b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gimp-print 4.2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2002-03-15 20:31+0100\n"
"Last-Translator: Hylke Witjens <hylke@wwd.nl>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -14,8 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
msgstr ""
@@ -29,70 +31,73 @@ msgstr "Envelop"
msgid "Hybrid EvenTone"
msgstr "Envelop"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Letter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "Envelop"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "Envelop"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr ""
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "besteld"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Snel"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Zeer snel"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybride Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Densiteit:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -102,15 +107,15 @@ msgstr ""
"dentisiteit als de inkt door het papier heenkomt of vlekt; verhoog de "
"dentisiteit als zwarte stukken niet goed dicht zijn."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -348,7 +353,7 @@ msgstr "Overige"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Grootte"
@@ -364,60 +369,60 @@ msgstr "Grootte"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Printerinstellingen"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Grootte van het papaier waarop je wenst te printen"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Medium Type"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Medium Bron"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr ""
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Resolutie"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Resolutie en kwaliteit van de afdruk"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Inkt type"
@@ -425,22 +430,22 @@ msgstr "Inkt type"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Type inkt van de printer"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -450,13 +455,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Printer model:"
@@ -465,97 +470,97 @@ msgstr "Printer model:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Blank papier"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Densiteit:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Pas de hoeveelheid cyaan aan"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Pas de hoeveelheid magenta aan"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Densiteit:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Pas de hoeveelheid geel aan"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Densiteit:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Pas de hoeveelheid cyaan aan"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Licht Cyaan"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Licht Magenta"
@@ -565,13 +570,13 @@ msgstr "Licht Magenta"
msgid "Light Yellow Transition"
msgstr "Licht Cyaan"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -613,28 +618,28 @@ msgid "CMY Color"
msgstr "CMY kleuren"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Zwart"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Kleur"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Zwart en Wit"
@@ -830,15 +835,15 @@ msgstr "Gamma:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyaan"
@@ -847,15 +852,15 @@ msgstr "Cyaan"
msgid "Adjust the cyan gamma"
msgstr "Pas de hoeveelheid cyaan aan"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -864,15 +869,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr "Pas de hoeveelheid magenta aan"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Geel"
@@ -881,10 +886,10 @@ msgstr "Geel"
msgid "Adjust the yellow gamma"
msgstr "Pas de hoeveelheid geel aan"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -893,7 +898,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Pas de hoeveelheid geel aan"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -903,10 +908,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Pas de hoeveelheid magenta aan"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1232,173 +1237,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standaard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Rolinvoer"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Handmatig"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Afdrukken Naar Bestand"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Handmatig"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Handmatig"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Lade"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Fotopapier"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "Automatisch Selecteren"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Hoogte: "
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Foto"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Zes kleuren foto"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "Licht Cyaan"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Licht Magenta"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Zwart"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Geel"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Mat papier"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Fotopapier"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Glanzende laag"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Zwart"
@@ -1585,137 +1590,138 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Pas de hoeveelheid geel aan"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Densiteit:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Pas de hoeveelheid geel aan"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Densiteit:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Pas de hoeveelheid cyaan aan"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Glanzende laag"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Pas de hoeveelheid geel aan"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Licht Cyaan"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Licht Cyaan"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Licht Cyaan"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Licht Cyaan"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr ""
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Afdrukken Naar Bestand"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Handmatig"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Grootte"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 DPI unidirectioneel"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 DPI unidirectioneel"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Printer ondersteund geen kleuren\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1875,8 +1881,8 @@ msgstr "Ilford Heavy Paper"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -1999,24 +2005,24 @@ msgstr "600x600 DPI monochrome"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Kleur + Zwarte patronen"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Kleur + Foto patronen"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "PPD Bestand:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5815,51 +5821,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6355,7 +6361,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Afmetingen"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Breedte: "
@@ -6364,7 +6370,7 @@ msgstr "Breedte: "
msgid "Width of the paper that you wish to print to"
msgstr "Breedte van het papier waarop je wenst te printen"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Hoogte: "
@@ -6649,11 +6655,11 @@ msgstr ""
"Selecteer de naam van de printer (Niet het type, of model, of printer) "
"waarna je wenst te printen"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Instellen Printer..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6661,129 +6667,129 @@ msgstr ""
"Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
"deze printer af te drukken."
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Nieuwe Printer..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr ""
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Grootte"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Schaldn"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Geef de schaal (formaat) van het plaatje"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Procent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr ""
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Geef de breedte van de afdruk"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Geef de hoogte van de afdruk"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
msgstr ""
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr ""
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr ""
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr ""
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Sluiten"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Afdruk voorvertoning"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr ""
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr ""
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr ""
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Past uitvoer aan..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Eenheden"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr ">"
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Eenheden"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr ""
@@ -6909,29 +6915,27 @@ msgstr "Lade 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "Test afdruk"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Dutch"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7143,19 +7147,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Kan niet lezen van %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Kan %s niet openen lezen/schrijven: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Kan niet schrijven naar %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7164,7 +7172,7 @@ msgstr ""
"\n"
"Kan niet schrijven naar %s:%s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7175,226 +7183,226 @@ msgstr ""
"Kan printer type niet vaststellen.\n"
"Gebruik asjeblief -m om je printermodel te specificeren.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Gekleurdheid:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, c-format
msgid "Error: Ink out\n"
msgstr ""
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, c-format
msgid "Error: Paper out\n"
msgstr ""
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Kleureninkt"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Overblijvend percentage"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Printer status heeft een raw device nodig.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Printer status heeft een raw device nodig.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "U mag maar een printermodel specificeren"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Bezig met het schoonmaken van de koppen..\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
"Bezig met nozzle check, let er astublief op, dat er papier in de printer "
"zit.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7472,7 +7480,7 @@ msgstr ""
"It is essential that you not turn your printer off during this procedure.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7550,17 +7558,17 @@ msgstr ""
"tijdens deze procedure.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Niet mogelijk om commando's naar de printer te sturen, eindigd.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7572,19 +7580,19 @@ msgid ""
"What do you want to do (s, q, r)?\n"
msgstr ""
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr ">"
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7593,19 +7601,19 @@ msgstr ""
"OK, je printer is uitgelijnt, maar de uitlijnen is niet bewaard.\n"
"Als je de uitlijning wilt bewaren, moet je het proces herhalen.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr ""
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Herhaal de uitlijn procedure.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7615,17 +7623,17 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "Bezig met schrijven van instellingen..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "Gefaalt!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7634,27 +7642,27 @@ msgstr ""
"Je instellingen werden niet succesvol weggeschreven. Je moet de\n"
"uitlijn procedure herhalen.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "Gelukt!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, fuzzy, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Je uitlijn instellingen zijn bewaard door de printer.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Onbekend commando.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Laatste commando is niet bevestigd.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7665,12 +7673,12 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Druk enter om door te gaan >"
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7681,42 +7689,42 @@ msgstr ""
"patroon.\n"
"Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr ""
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Voer astublief een nieuw vel papier in.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Nummer valt buiten bereik!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Ik begrijp wat je zonet ingetikt hebt niet!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Probeert uitlijning in te stellen."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "gelukt.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7729,7 +7737,7 @@ msgstr ""
"lijn patroon %d is. Als het dat niet is, zul je de procedure moeten\n"
"herhalen om de beste kwaliteit te krijgen.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr ""
@@ -7738,7 +7746,7 @@ msgstr ""
msgid "Printing..."
msgstr "Bezig met afdrukken..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr ""
@@ -7754,113 +7762,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Zoek volgende rij faalde op %d\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Lukt niet om %s:%s te openen\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "Printer moet gespecificeerd worden met -sMODEL\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "Printer %s is geen bekend model\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Kan niet printen op printer %s met %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Onbekende printer %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Zoek volgende rij faalde op %d\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init faalde %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Lukt niet om %s:%s te openen\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Lukt niet om %s:%s te openen\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Onbekende printer %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Zoek volgende rij faalde op %d\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "Test afdruk"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "Zoek volgende rij faalde op %d\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index e39eacf..7b1e287 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index 93a295f..2446e14 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimp-print\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2001-10-18 11:53+0100\n"
"Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -18,8 +18,10 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Ustaw domy¶lne"
@@ -34,84 +36,87 @@ msgstr "Koperta"
msgid "Hybrid EvenTone"
msgstr "Koperta"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
msgstr ""
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "Koperta"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "Koperta"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr ""
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr ""
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr ""
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr ""
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr ""
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Gêsto¶æ:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
"regions are not solid."
msgstr ""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Algorytm ditherowania"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -350,7 +355,7 @@ msgstr "Inne"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Rozmiar"
@@ -366,59 +371,59 @@ msgstr "Rozmiar"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Ustawienia drukarki"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
msgstr ""
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr ""
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr ""
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr ""
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Rozdzielczo¶æ"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr ""
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr ""
@@ -426,22 +431,22 @@ msgstr ""
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr ""
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -451,13 +456,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Model drukarki:"
@@ -466,92 +471,92 @@ msgstr "Model drukarki:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Zwyk³y papier"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Gêsto¶æ:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
msgstr ""
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Purpurowy"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
msgstr ""
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Gêsto¶æ:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
msgstr ""
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Gêsto¶æ:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
msgstr ""
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
msgstr ""
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
msgstr ""
@@ -559,13 +564,13 @@ msgstr ""
msgid "Light Yellow Transition"
msgstr ""
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -606,28 +611,28 @@ msgid "CMY Color"
msgstr ""
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Czarny"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Kolor"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr ""
@@ -823,15 +828,15 @@ msgstr "Gamma:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Niebieskozielony"
@@ -839,15 +844,15 @@ msgstr "Niebieskozielony"
msgid "Adjust the cyan gamma"
msgstr ""
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Purpurowy"
@@ -855,15 +860,15 @@ msgstr "Purpurowy"
msgid "Adjust the magenta gamma"
msgstr ""
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "¯ó³æ"
@@ -871,10 +876,10 @@ msgstr "¯ó³æ"
msgid "Adjust the yellow gamma"
msgstr ""
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -882,7 +887,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr ""
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -891,10 +896,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr ""
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1214,167 +1219,167 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr ""
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr ""
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
msgstr ""
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Wydrukowaæ do pliku?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
msgid "Manual Sheet Guide"
msgstr ""
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Typ wyj¶ciowy:"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
msgstr ""
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Czarny"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr ""
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Wysoko¶æ:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Fotografia"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr ""
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Purpurowy"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Czarny"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "¯ó³æ"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Czarny"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Czarny"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr ""
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Czarny"
@@ -1554,129 +1559,130 @@ msgstr ""
msgid "Adjust the red map"
msgstr ""
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Gêsto¶æ:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
msgstr ""
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Gêsto¶æ:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
msgstr ""
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
msgstr ""
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
msgstr ""
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Typ wyj¶ciowy:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Wydrukowaæ do pliku?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Typ wyj¶ciowy:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Rozmiar"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr ""
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "1440 x 720 DPI"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr ""
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1836,8 +1842,8 @@ msgstr ""
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -1953,24 +1959,24 @@ msgstr ""
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "Plik PPD:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5755,51 +5761,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6295,7 +6301,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Wymiary:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Szeroko¶æ:"
@@ -6304,7 +6310,7 @@ msgstr "Szeroko¶æ:"
msgid "Width of the paper that you wish to print to"
msgstr ""
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Wysoko¶æ:"
@@ -6558,139 +6564,139 @@ msgid ""
"wish to print to"
msgstr ""
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr ""
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr ""
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr ""
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr ""
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Rozmiar"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Skalowanie:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr ""
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Procent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr ""
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr ""
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr ""
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr ""
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
msgstr ""
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr ""
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Regulacja koloru wydruku"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Ustaw domy¶lne"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Zamknij"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Podgl±d obrazu"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Typ wyj¶ciowy:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Typ wyj¶ciowy:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr ""
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr ""
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Jednostki:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
msgstr ""
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Jednostki:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr ""
@@ -6813,29 +6819,27 @@ msgstr ""
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "Wydrukuj"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Polish"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin2"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7025,19 +7029,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Nie mo¿na odczytaæ z %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr ""
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Nie mo¿na zapisaæ do %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7046,7 +7054,7 @@ msgstr ""
"\n"
"Nie mo¿na zapisaæ do %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7054,224 +7062,224 @@ msgid ""
"Please use -m to specify your printer model.\n"
msgstr ""
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Nasycenie:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, c-format
msgid "Error: Ink out\n"
msgstr ""
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, c-format
msgid "Error: Paper out\n"
msgstr ""
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr ""
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Mo¿na podaæ tylko jeden model drukarki."
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Czyszczenie g³owic...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7310,7 +7318,7 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7346,17 +7354,17 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr ""
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7368,38 +7376,38 @@ msgid ""
"What do you want to do (s, q, r)?\n"
msgstr ""
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr ""
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
"If you wish to save the alignment, you must repeat this process.\n"
msgstr ""
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr ""
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr ""
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7409,44 +7417,44 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr ""
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr ""
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr ""
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr ""
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr ""
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7457,12 +7465,12 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr ""
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7470,42 +7478,42 @@ msgid ""
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr ""
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr ""
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr ""
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr ""
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr ""
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr ""
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr ""
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7514,7 +7522,7 @@ msgid ""
"quality printing.\n"
msgstr ""
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr ""
@@ -7523,7 +7531,7 @@ msgstr ""
msgid "Printing..."
msgstr "Drukowanie..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Plik/Wydrukuj..."
@@ -7539,113 +7547,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Nieznana opcja %c\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Nieznana opcja %c\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Nieznana opcja %c\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Nieznana opcja %c\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr ""
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "Wydrukuj"
+
+#, fuzzy
#~ msgid "EPSON Stylus C50"
#~ msgstr "Stylus C60"
diff --git a/po/pt.gmo b/po/pt.gmo
index afb2391..8e88a71 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
Binary files differ
diff --git a/po/pt.po b/po/pt.po
index 9566733..e452cc4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gimpprint 4.3.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2006-05-04 07:20-0400\n"
"Last-Translator: Filipe Maia <fmaia@gmx.net>\n"
"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -14,8 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Definir Valores Padrão"
@@ -29,70 +31,73 @@ msgstr "EvenTone"
msgid "Hybrid EvenTone"
msgstr "EvenTone"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Carta"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "EvenTone"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "EvenTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Híbrido Adaptativo"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordenado"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Rápido"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Muito Rápido"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Híbrido Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Densidade:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -103,15 +108,15 @@ msgstr ""
"a tinta pinga ou borrata o papel, aumente a densidade se as zonas pretas\n"
"não aparecem sólidas."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Algoritmos de \"Dither\"\""
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
#, fuzzy
msgid ""
"Choose the dither algorithm to be used.\n"
@@ -357,7 +362,7 @@ msgstr "Outro"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Tamanho"
@@ -373,61 +378,61 @@ msgstr "Tamanho"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Definições da Impressora"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Tamanho do papel para o qual deseja imprimir"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Tipo de Média"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Fonte de Média"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
msgstr "Fonte do \"media\" para o qual está a imprimir"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Resolução"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Resolução e qualidade da impressão"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Tipo de tinta"
@@ -435,22 +440,22 @@ msgstr "Tipo de tinta"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Tipo de tinta na impressora"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -460,13 +465,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Modelo da Impressora:"
@@ -475,97 +480,97 @@ msgstr "Modelo da Impressora:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Papel ColorLife"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Densidade:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Ajustar o equilíbrio de ciano na impressão"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Ajustar o equilíbrio de magenta da impressão"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Densidade:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Densidade:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Ajustar o equilíbrio de ciano na impressão"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Ciano Claro"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Magenta Claro"
@@ -575,13 +580,13 @@ msgstr "Magenta Claro"
msgid "Light Yellow Transition"
msgstr "Ciano Claro"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -623,28 +628,28 @@ msgid "CMY Color"
msgstr "Cor CMY"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Preto"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Cor"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Preto e Branco"
@@ -846,15 +851,15 @@ msgstr "Gama:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Ciano"
@@ -863,15 +868,15 @@ msgstr "Ciano"
msgid "Adjust the cyan gamma"
msgstr "Ajustar o equilíbrio de ciano na impressão"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
@@ -880,15 +885,15 @@ msgstr "Magenta"
msgid "Adjust the magenta gamma"
msgstr "Ajustar o equilíbrio de magenta da impressão"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "Amarelo"
@@ -897,10 +902,10 @@ msgstr "Amarelo"
msgid "Adjust the yellow gamma"
msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -909,7 +914,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -919,10 +924,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Ajustar o equilíbrio de magenta da impressão"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1253,173 +1258,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Rolo de Alimentação"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Manual"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Imprimir para o Ficheiro?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Manual"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Manual"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Tabuleiro"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Papel de Fotografia"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "Auto Seleccionar"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Altura"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Fotografia"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Seis Cores Foto"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "Ciano Claro"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Magenta Claro"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Preto"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "Amarelo"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Papel Mate"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Papel de Fotografia"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Filme Lustroso"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Preto"
@@ -1607,138 +1612,139 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Densidade:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Densidade:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Ajustar o equilíbrio de ciano na impressão"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Filme Lustroso"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Ciano Claro"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Ciano Claro"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Ciano Claro"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Ciano Claro"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Tipo de Output:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Imprimir para o Ficheiro?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Tipo de Output:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Tamanho"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 DPI Unidireccional"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 DPI Unidireccional"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "A impressora não suporta a cor de impressão\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1898,8 +1904,8 @@ msgstr "Papel Pesado Ilford"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2022,24 +2028,24 @@ msgstr "600x600 DPI monocromático"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Cartuchos Cor + Preto"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Cartuchos Cor + Fotografia"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "Ficheiro PPD:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5835,51 +5841,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6391,7 +6397,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Dimensões:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Largura:"
@@ -6400,7 +6406,7 @@ msgstr "Largura:"
msgid "Width of the paper that you wish to print to"
msgstr "Largura do papel para o qual deseja imprimir"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Altura"
@@ -6685,11 +6691,11 @@ msgstr ""
"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
"a qual deseja imprimir"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Configurar Impressora..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6698,11 +6704,11 @@ msgstr ""
"imprimir\n"
"para esta impressora"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Nova Impressora..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6710,24 +6716,24 @@ msgstr ""
"Definir uma nova impressora lógica. Isto pode ser usado para denominar uma "
"colecção de definições que você deseje guardar para uso futuro"
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Tamanho"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Redimesionamento:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Definir a escala (tamanho) da imagem"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6735,31 +6741,31 @@ msgstr ""
"Seleccione se a escala é medida em percentagem do tamanho de página "
"disponível ou número de pontos por polegada na impressão"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Precentagem"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Redimensionar a impressão para o tamanho da página"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Redimensionar a impressão para o número de pontos por polegada"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Definir a largura da impressão"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Definir a altura da impressão"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6767,69 +6773,69 @@ msgstr ""
"Usar Original\n"
"Tamanho de Imagem"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Definir como tamanho de impressão o tamanho da imagem"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Ajustamento da Cor de Impressão"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Definir Valores Padrão"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Fechar"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Previsualização da Imagem"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Tipo de Output:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Tipo de Output:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Seleccione o tipo de output desejado"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Ajustar o Output..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
"\"dither\""
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Unidades:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Unidades:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Seleccione a base das unidades de medida para impressão"
@@ -6956,29 +6962,27 @@ msgstr "Tabuleiro 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "impressão de teste"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Portuguese"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7264,19 +7268,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Não é possível ler a partir de %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Status da impressora requere a utilização de um dipositivo.\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Não foi possível escrever para %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7285,7 +7293,7 @@ msgstr ""
"\n"
"Não foi possível escrever para %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7296,225 +7304,225 @@ msgstr ""
"Não foi possível detecar o tipo de impressora.\n"
"Por favor use a opção -m para especificar o modelo da sua impressora.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Saturação:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "Erro no input\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "Erro no input\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Cor da Tinta"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Percentagem restante"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Você só pode especificar um modelo de impressora"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Limpando as cabeças...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
"A testar a agulha, por favor assegure-se que existe papel na impressora.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7599,7 +7607,7 @@ msgstr ""
"procedimento.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7674,17 +7682,17 @@ msgstr ""
"os resultados. É essencial que você não desligue a impressora durante este "
"procedimento.\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7703,20 +7711,20 @@ msgstr ""
"Vai-lhe ser pedido para confirmar a sua escolha.\n"
"O que é que pretende fazer (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
"Por favor confirme carregando em 'q' outra vez se deseja sair sem gravar:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7725,7 +7733,7 @@ msgstr ""
"A sua impressora está alinhada, mas o alinhamento não foi gravado.\n"
"Se deseja gravar o alinhamento, terá de repetir o processo.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7734,12 +7742,12 @@ msgstr ""
"Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
"o processo de alinhamento:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Repetindo o processo de alinhamento.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7754,17 +7762,17 @@ msgstr ""
"Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
"as configurações para a sua impressora:\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "Prestes a gravar as configurações..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "falhou!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7773,28 +7781,28 @@ msgstr ""
"A suas configurações não foram gravados com sucesso.\n"
"Vai ter de repetir o processo de alinhamento.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "sucesso!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr ""
"As suas configurações do alinhamento foram gravadas para a impressora.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Comando desconhecido.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "O comando final não foi confirmado.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7811,12 +7819,12 @@ msgstr ""
"Por favor coloque uma folha de papel na impressora para iniciar\n"
"o processo de alinhamento da cabeça.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Pressione enter para continuar > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7827,42 +7835,42 @@ msgstr ""
"padrão.\n"
"Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Passagem #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Por favor insira uma nova folha de papel.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Número fora do intervalo|\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Eu não consigo intender o que escreveu!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "O melhor par de linhasdeve estar numerado entre 1 e %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Tentando definir o alinhamento..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "sucesso.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7877,7 +7885,7 @@ msgstr ""
"é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
"qualidade de impressão.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Erro no input\n"
@@ -7886,7 +7894,7 @@ msgstr "Erro no input\n"
msgid "Printing..."
msgstr "Imprimindo..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Ficheiro/Imprimir..."
@@ -7902,113 +7910,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "Espaço de cor inválido: bps %d channels %d space %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Sem buffer de linha\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Não foi possível procesar parâmetro %s=%s (número esperado)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "Impressora deve ser especificada com -sModelo\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "Impressora %s não é um modelo conhecido\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Não é possível imprimir para impressora %s com %s\n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Impressora desconhecida %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Obtenção da próxima linha falhou em %.0f\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init falhou %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Não foi possível abrir \"file descriptor\": %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Não foi possível abrir %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Impressora desconhecida %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "Parâmetros inválidos; não é possível continuar|\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Obtenção da próxima linha falhou em %.0f\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "impressão de teste"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "ijs_server_get_page_header falhou %d\n"
@@ -8320,9 +8332,6 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
#~ msgid "Red Balance"
#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Status da impressora requere a utilização de um dipositivo.\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
diff --git a/po/sk.gmo b/po/sk.gmo
index 361faa5..f3f766b 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
Binary files differ
diff --git a/po/sk.po b/po/sk.po
index 2daddd7..98f79c6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GIMP Print\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
"PO-Revision-Date: 2002-05-20 18:08+0100\n"
"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -16,8 +16,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
#, fuzzy
msgid "Default"
msgstr "Nastavi» ¹tandardné"
@@ -32,70 +34,73 @@ msgstr "Obálka"
msgid "Hybrid EvenTone"
msgstr "Obálka"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
#, fuzzy
msgid "EvenBetter"
msgstr "Letter"
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
#, fuzzy
msgid "Hybrid EvenBetter"
msgstr "Obálka"
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
#, fuzzy
msgid "UniTone"
msgstr "Obálka"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr ""
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptívne hybridný"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Postupný"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Rýchly"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Veµmi rýchly"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybridný Floyd-Steinbergov"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
#, fuzzy
msgid "Density"
msgstr "Hustota:"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -105,15 +110,15 @@ msgstr ""
"teèie po papieri, alebo sa rozmazáva; zvý¹te hustotu, ak èierne oblasti sú "
"jednoliate."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "Algoritmus rozptylu"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
#, fuzzy
msgid ""
"Choose the dither algorithm to be used.\n"
@@ -360,7 +365,7 @@ msgstr "Iné"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
#, fuzzy
msgid "Page Size"
msgstr "Veµkos»"
@@ -376,61 +381,61 @@ msgstr "Veµkos»"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
#, fuzzy
msgid "Basic Printer Setup"
msgstr "Nastavenie tlaèiarne"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
#, fuzzy
msgid "Size of the paper being printed to"
msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Typ média"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr ""
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "Zdroj média"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "Rozlí¹enie"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "Rozlí¹enie a kvalita tlaèe"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "Typ atramentu"
@@ -438,22 +443,22 @@ msgstr "Typ atramentu"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr ""
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "Typ atramentu tlaèiarne"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -463,13 +468,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr ""
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Printing Mode"
msgstr "Model tlaèiarne:"
@@ -478,97 +483,97 @@ msgstr "Model tlaèiarne:"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
#, fuzzy
msgid "Core Parameter"
msgstr "Obyèajný papier"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr ""
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Hustota:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Purpurová"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Hustota:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Hustota:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Jasná azúrová"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Jasná purpurová"
@@ -578,13 +583,13 @@ msgstr "Jasná purpurová"
msgid "Light Yellow Transition"
msgstr "Jasná azúrová"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -626,28 +631,28 @@ msgid "CMY Color"
msgstr "CMY farba"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Èierna"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "Farebne"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
#, fuzzy
msgid "Black and White"
msgstr "Èiernobielo"
@@ -848,15 +853,15 @@ msgstr "Gama:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Azúrová"
@@ -865,15 +870,15 @@ msgstr "Azúrová"
msgid "Adjust the cyan gamma"
msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Purpurová"
@@ -882,15 +887,15 @@ msgstr "Purpurová"
msgid "Adjust the magenta gamma"
msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "®ltá"
@@ -899,10 +904,10 @@ msgstr "®ltá"
msgid "Adjust the yellow gamma"
msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr ""
@@ -911,7 +916,7 @@ msgstr ""
msgid "Adjust the red gamma"
msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr ""
@@ -921,10 +926,10 @@ msgstr ""
msgid "Adjust the green gamma"
msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr ""
@@ -1255,173 +1260,173 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "©tandardný"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Kotúèový podávaè"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
#, fuzzy
msgid "Manual Feed"
msgstr "Manuál"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
#, fuzzy
msgid "Print to CD"
msgstr "Tlaèi» do súboru?"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "Manuál"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "Manuál"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Zásobník"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "Fotografický papier"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
msgstr "Automatický výber"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
#, fuzzy
msgid "High"
msgstr "Vý¹ka:"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
#, fuzzy
msgid "Photo"
msgstr "Fotografia"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
msgstr "Fotografický ¹es»farebný"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
#, fuzzy
msgid "Light Cyan"
msgstr "Jasná azúrová"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
#, fuzzy
msgid "Light Magenta"
msgstr "Jasná purpurová"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
#, fuzzy
msgid "Light Black"
msgstr "Èierna"
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
#, fuzzy
msgid "Dark Yellow"
msgstr "®ltá"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
#, fuzzy
msgid "Matte Black"
msgstr "Matný papier"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
#, fuzzy
msgid "Photo Black"
msgstr "Fotografický papier"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
#, fuzzy
msgid "Gloss Optimizer"
msgstr "Lesklý film"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
#, fuzzy
msgid "Light Light Black"
msgstr "Èierna"
@@ -1609,138 +1614,139 @@ msgstr ""
msgid "Adjust the red map"
msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Hustota:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Hustota:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
#, fuzzy
msgid "Gloss Level"
msgstr "Lesklý film"
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
#, fuzzy
msgid "Adjust the gloss level"
msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Jasná azúrová"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Jasná azúrová"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Jasná azúrová"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Jasná azúrová"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Typ výstupu:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr ""
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr ""
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Tlaèi» do súboru?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Typ výstupu:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
#, fuzzy
msgid "Automatic"
msgstr "Veµkos»"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
#, fuzzy
msgid "Bidirectional"
msgstr "600 DPI Jednosmerne"
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
#, fuzzy
msgid "Unidirectional"
msgstr "600 DPI Jednosmerne"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr "Tlaèiareò nepodporuje farebný výstup\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1900,8 +1906,8 @@ msgstr "Ilford »a¾ký papier"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -2024,24 +2030,24 @@ msgstr "600x600 DPI monochromaticky"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr "Farebná + èierna kazeta"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr "Farebná + Foto kazeta"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "PPD súbor:"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
#, fuzzy
msgid "PPD File"
@@ -5840,51 +5846,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6394,7 +6400,7 @@ msgstr ""
msgid "Dimensions:"
msgstr "Rozmery:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "©írka:"
@@ -6403,7 +6409,7 @@ msgstr "©írka:"
msgid "Width of the paper that you wish to print to"
msgstr "©írka papiera, na ktorý chcete tlaèi»"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "Vý¹ka:"
@@ -6688,11 +6694,11 @@ msgstr ""
"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
"tlaèi»"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Nastavenie tlaèiarne..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
@@ -6700,11 +6706,11 @@ msgstr ""
"Voµba model tlaèiarne, PPD súboru a príkaz, ktorý sa pou¾íva pre tlaè na "
"tejto tlaèiarni"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Nová tlaèiareò..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
@@ -6712,24 +6718,24 @@ msgstr ""
"Definovanie novej logickej tlaèiarne. Toto mô¾e by» pou¾ité na pomenovanie "
"zbierky nastavení, ktoré si prajete zapamäta» a v budúcnosti pou¾íva»."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
#, fuzzy
msgid "Image Size"
msgstr "Veµkos»"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Zmena:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "Nastavi» zväè¹enie (veµkos») obrázku"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
@@ -6737,31 +6743,31 @@ msgstr ""
"Zvoµte, èi zmena veµkosti bude vyjadrená ako percento dostupnej veµkosti "
"stránky, alebo ako èíslo výstupného DPI"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Percentá"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "Nastavi» ¹írku tlaèe"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "Nastavi» vý¹ku tlaèe"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6769,68 +6775,68 @@ msgstr ""
"Pou¾i» pôvodnú\n"
"veµkos» obrázka"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "Prispôsobenie farieb pre tlaè"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr "Nastavi» ¹tandardné"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "Zatvori»"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "Náhµad obrázku"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
#, fuzzy
msgid "Output"
msgstr "Typ výstupu:"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Typ výstupu:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "Zvoµte vytú¾ený typ výstupu"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Prispôsobi» výstup..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
"Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
#, fuzzy
msgid "Size Units:"
msgstr "Jednotky:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
#, fuzzy
msgid " "
msgstr "> "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Jednotky:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "Zvoli» základnú mernú jednotku pre tlaè"
@@ -6957,29 +6963,27 @@ msgstr "Zásobník 4"
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "Test tlaèe"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Slovak"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr ""
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr ""
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7279,19 +7283,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "Nie je mo¾né èíta» z %s: %s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Nie je mo¾né zapisova» do %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7300,7 +7308,7 @@ msgstr ""
"\n"
"Nie je mo¾né zapisova» do %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7311,224 +7319,224 @@ msgstr ""
"Nie je mo¾né zisti» typ tlaèiarne.\n"
"Pou¾ite prosím -m na urèenie modelu va¹ej tlaèiarne.\n"
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr ""
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "Sýtos»:"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, fuzzy, c-format
msgid "Error: Ink out\n"
msgstr "Chyba na vstupe\n"
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, fuzzy, c-format
msgid "Error: Paper out\n"
msgstr "Chyba na vstupe\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "Farebný atrament"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr "Zostávajúce percentá"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr ""
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, fuzzy, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, fuzzy, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr ""
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, fuzzy, c-format
msgid "Cannot identify printer model.\n"
msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Èistenie hláv...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7603,7 +7611,7 @@ msgstr ""
"toho procesu nevypli tlaèiareò\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7673,17 +7681,17 @@ msgstr ""
"nevypli tlaèiareò\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7702,20 +7710,20 @@ msgstr ""
"Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
"Èo chcete spravi»? (s,q,r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
"Potvrïte prosím opätovným stlaèením 'q', ¾e si ¾eláte ukonèi» bez ulo¾enia:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -7724,7 +7732,7 @@ msgstr ""
"V poriadku, va¹a tlaèiareò je zarovnaná, ale zarovnanie nebolo ulo¾ené.\n"
"Ak si ¾eláte ulo¾i» zarovnanie, musíte tento proces zopakova».\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -7733,12 +7741,12 @@ msgstr ""
"Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
"zarovnávania:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Opakujem proces zarovnávania.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7753,17 +7761,17 @@ msgstr ""
"Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
"va¹ej tlaèiarne:\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "O nastaveniach ukladania..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "zlyhalo!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
@@ -7772,27 +7780,27 @@ msgstr ""
"Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
"procedúru zarovnávania.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "úspe¹ne!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr "Neznámy príkaz.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr "Závereèný príkaz nebol potvrdený.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7809,12 +7817,12 @@ msgstr ""
"Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n"
"procedúra zarovnávania hlavy.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "Pre pokraèovanie stlaète enter > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7824,42 +7832,42 @@ msgstr ""
"Preskúmajte pozorne výtlaèok a zvoµte najlep¹í pár èiar v ka¾dej vzorke.\n"
"Stlaète èíslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Prechod #%d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Vlo¾te prosím nový hárok papiera.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "Èíslo je mimo rozsahu!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr "Pokú¹am sa nastavi» zarovnávanie..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "úspe¹né.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7872,7 +7880,7 @@ msgstr ""
"d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie "
"výsledky pri tlaèi.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Chyba na vstupe\n"
@@ -7881,7 +7889,7 @@ msgstr "Chyba na vstupe\n"
msgid "Printing..."
msgstr "Tlaèím..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Súbor/Tlaè..."
@@ -7897,113 +7905,117 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr "Zlý farebný priestor: bps %d kanály %d priestor %s\n"
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr "Neexistuje riadkový bufer\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, fuzzy, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr "Nie je mo¾né analyzova» parameter %s=%s (oèakáva sa èíslo)\n"
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "Tlaèiareò musí by» urèené pomocou -sModel\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "Tlaèiareò %s nie je známy model\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr "Neznáma tlaèiareò %s\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr "image_init zlyhalo %d\n"
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr "Nepodarilo sa otvori» popis súboru: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "Nie je mo¾né otvori» %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr "Neznáma tlaèiareò %s\n"
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr "Zlé parametre; nie je mo¾né pokraèova»!\n"
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
#, fuzzy
+#~ msgid "Gutenprint"
+#~ msgstr "Test tlaèe"
+
+#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
@@ -8315,9 +8327,6 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
#~ msgid "Red Balance"
#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
-
#, fuzzy
#~ msgid "Gloss Balance"
#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
diff --git a/po/sv.gmo b/po/sv.gmo
index b11ca35..25c0700 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index 2218f61..8feb98e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,118 +1,118 @@
-# Swedish messages for gimp-print.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Swedish messages for gutenprint.
+# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+# Daniel Nylander <po@danielnylander.se>, 2006.
# Christian Rose <menthos@menthos.com>, 2001, 2002.
#
-# $Id: sv.po,v 1.79 2006/05/06 01:34:54 rlk Exp $
+# $Id: sv.po,v 1.82 2006/05/29 00:07:55 rlk Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: gimp-print\n"
+"Project-Id-Version: gutenprint 5.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
-"PO-Revision-Date: 2002-10-03 13:47+0200\n"
-"Last-Translator: Christian Rose <menthos@menthos.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"PO-Revision-Date: 2006-05-23 23:04+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
-#, fuzzy
+#: src/main/print-escp2.c:1609
msgid "Default"
-msgstr "Ställ in standardvärden"
+msgstr "Standard"
#: src/main/dither-main.c:47
msgid "EvenTone"
msgstr "EvenTone"
#: src/main/dither-main.c:48
-#, fuzzy
msgid "Hybrid EvenTone"
-msgstr "EvenTone"
+msgstr "Hybrid EvenTone"
-#: src/main/dither-main.c:54
-#, fuzzy
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
-msgstr "Letter"
+msgstr "EvenBetter"
-#: src/main/dither-main.c:55
-#, fuzzy
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
-msgstr "EvenTone"
+msgstr "Hybrid EvenBetter"
-#: src/main/dither-main.c:61
-#, fuzzy
+#: src/main/dither-main.c:60
msgid "UniTone"
-msgstr "EvenTone"
+msgstr "UniTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
-msgstr ""
+msgstr "Hybrid UniTone"
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptiv hybrid"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Sorterad"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Snabb"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Mycket snabb"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybrid Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
-#, fuzzy
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
-msgstr "Intensitet:"
+msgstr "Densitet"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
"regions are not solid."
msgstr ""
-"Justera intensiteten (mängden bläck) på utskriften. Minska intensiteten om "
-"bläcket tränger igenom pappret eller smetar; öka intensiteten om svarta "
-"områden inte är helt svarta."
+"Justera intensiteten (mängden bläck) på utskriften. Minska intensiteten om "
+"bläcket tränger igenom pappret eller smetar; öka intensiteten om svarta "
+"områden inte är helt svarta."
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
-msgstr "Färgutjämningsalgoritm"
+msgstr "Färgutjämningsalgoritm"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
#, fuzzy
msgid ""
"Choose the dither algorithm to be used.\n"
@@ -124,17 +124,17 @@ msgid ""
"art.\n"
"Hybrid Floyd-Steinberg generally produces inferior output."
msgstr ""
-"Välj vilken färgutjämningsalgoritm som ska användas.\n"
-"Adaptiv hybrid producerar normalt bäst kvalitet i de flesta sammanhang.\n"
-"Sorterad är snabbare och producerar nästan lika bra kvalitet på "
+"Välj vilken färgutjämningsalgoritm som ska användas.\n"
+"Adaptiv hybrid producerar normalt bäst kvalitet i de flesta sammanhang.\n"
+"Sorterad är snabbare och producerar nästan lika bra kvalitet på "
"fotografier.\n"
-"Snabb och Mycket snabb är avsevärt snabbare, och fungerar bra med text och "
+"Snabb och Mycket snabb är avsevärt snabbare, och fungerar bra med text och "
"radgrafik.\n"
-"Hybrid Floyd-Steinberg producerar i allmänhet mycket sämre resultat."
+"Hybrid Floyd-Steinberg producerar i allmänhet mycket sämre resultat."
#: src/main/module.c:52
msgid "Miscellaneous (unclassified)"
-msgstr ""
+msgstr "Diverse (ej klassifierad)"
#: src/main/module.c:53
msgid "Family driver"
@@ -147,152 +147,127 @@ msgstr ""
#: src/main/module.c:55
#, fuzzy
msgid "Dither algorithm"
-msgstr "Färgutjämningsalgoritm"
+msgstr "Färgutjämningsalgoritm"
#: src/main/print-canon.c:1382
-#, fuzzy
msgid "90x90 DPI"
-msgstr "600 DPI"
+msgstr "90×90 DPI"
#: src/main/print-canon.c:1382
-#, fuzzy
msgid "90x90 DPI DMT"
-msgstr "600 DPI"
+msgstr "90×90 DPI DMT"
#: src/main/print-canon.c:1383
-#, fuzzy
msgid "180x180 DPI"
-msgstr "150×150 DPI"
+msgstr "180×180 DPI"
#: src/main/print-canon.c:1383
-#, fuzzy
msgid "180x180 DPI DMT"
-msgstr "150×150 DPI"
+msgstr "180×180 DPI DMT"
#: src/main/print-canon.c:1384
-#, fuzzy
msgid "360x360 DPI"
-msgstr "300×300 DPI"
+msgstr "360×360 DPI"
#: src/main/print-canon.c:1384
-#, fuzzy
msgid "360x360 DPI DMT"
-msgstr "600×600 DPI"
+msgstr "360×360 DPI DMT"
#: src/main/print-canon.c:1385
-#, fuzzy
msgid "720x360 DPI"
-msgstr "720 × 360 DPI"
+msgstr "720×360 DPI"
#: src/main/print-canon.c:1385
-#, fuzzy
msgid "720x360 DPI DMT"
-msgstr "720 × 360 DPI MW2"
+msgstr "720×360 DPI DMT"
#: src/main/print-canon.c:1386
-#, fuzzy
msgid "720x720 DPI"
-msgstr "2880 × 720 DPI"
+msgstr "720×720 DPI"
#: src/main/print-canon.c:1386
-#, fuzzy
msgid "720x720 DPI DMT"
-msgstr "2880 × 720 DPI"
+msgstr "720×720 DPI DMT"
#: src/main/print-canon.c:1387
-#, fuzzy
msgid "1440x720 DPI"
-msgstr "1440 × 720 DPI"
+msgstr "1440×720 DPI"
#: src/main/print-canon.c:1387
-#, fuzzy
msgid "1440x720 DPI DMT"
-msgstr "1440 × 720 DPI"
+msgstr "1440×720 DPI DMT"
#: src/main/print-canon.c:1388
-#, fuzzy
msgid "1440x1440 DPI"
-msgstr "1440 × 1440 DPI"
+msgstr "1440×1440 DPI"
#: src/main/print-canon.c:1388
-#, fuzzy
msgid "1440x1440 DPI DMT"
-msgstr "1440 × 1440 DPI"
+msgstr "1440×1440 DPI DMT"
#: src/main/print-canon.c:1389
-#, fuzzy
msgid "2880x2880 DPI"
-msgstr "2880 × 720 DPI"
+msgstr "2880×2880 DPI"
#: src/main/print-canon.c:1389
-#, fuzzy
msgid "2880x2880 DPI DMT"
-msgstr "2880 × 720 DPI"
+msgstr "2880×2880 DPI DMT"
#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
msgid "150x150 DPI"
-msgstr "150×150 DPI"
+msgstr "150×150 DPI"
#: src/main/print-canon.c:1390
-#, fuzzy
msgid "150x150 DPI DMT"
-msgstr "150×150 DPI"
+msgstr "150×150 DPI DMT"
#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
msgid "300x300 DPI"
-msgstr "300×300 DPI"
+msgstr "300×300 DPI"
#: src/main/print-canon.c:1391
-#, fuzzy
msgid "300x300 DPI DMT"
-msgstr "300×300 DPI"
+msgstr "300×300 DPI DMT"
#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
msgid "600x300 DPI"
-msgstr "600×300 DPI"
+msgstr "600×300 DPI"
#: src/main/print-canon.c:1392
-#, fuzzy
msgid "600x300 DPI DMT"
-msgstr "600×300 DPI"
+msgstr "600×300 DPI DMT"
#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
msgid "600x600 DPI"
-msgstr "600×600 DPI"
+msgstr "600×600 DPI"
#: src/main/print-canon.c:1393
-#, fuzzy
msgid "600x600 DPI DMT"
-msgstr "600×600 DPI"
+msgstr "600×600 DPI DMT"
#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
msgid "1200x600 DPI"
-msgstr "1200×600 DPI"
+msgstr "1200×600 DPI"
#: src/main/print-canon.c:1394
-#, fuzzy
msgid "1200x600 DPI DMT"
-msgstr "1200×600 DPI"
+msgstr "1200×600 DPI DMT"
#: src/main/print-canon.c:1395
-#, fuzzy
msgid "1200x1200 DPI"
-msgstr "1200×600 DPI"
+msgstr "1200×1200 DPI"
#: src/main/print-canon.c:1395
-#, fuzzy
msgid "1200x1200 DPI DMT"
-msgstr "1200×600 DPI"
+msgstr "1200×1200 DPI DMT"
#: src/main/print-canon.c:1396
-#, fuzzy
msgid "2400x2400 DPI"
-msgstr "2400×600 DPI"
+msgstr "2400×2400 DPI"
#: src/main/print-canon.c:1396
-#, fuzzy
msgid "2400x2400 DPI DMT"
-msgstr "2400×600 DPI"
+msgstr "2400×2400 DPI DMT"
#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
@@ -302,9 +277,8 @@ msgid "Plain Paper"
msgstr "Vanligt papper"
#: src/main/print-canon.c:1448
-#, fuzzy
msgid "Plain Paper PIXMA"
-msgstr "Vanligt papper"
+msgstr "Vanligt papper PIXMA"
#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
@@ -327,7 +301,7 @@ msgstr "Kuvert"
#: src/main/print-canon.c:1453
msgid "High Resolution Paper"
-msgstr "Högupplösningspapper"
+msgstr "Högupplösningspapper"
#: src/main/print-canon.c:1454
msgid "T-Shirt Transfers"
@@ -335,7 +309,7 @@ msgstr "T-shirttryck"
#: src/main/print-canon.c:1455
msgid "High Gloss Film"
-msgstr "Högglansig film"
+msgstr "Högglansig film"
#: src/main/print-canon.c:1456
msgid "Glossy Photo Paper"
@@ -359,10 +333,9 @@ msgstr "Annat"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
-#, fuzzy
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
-msgstr "Storlek"
+msgstr "Pappersstorlek"
#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
@@ -375,86 +348,84 @@ msgstr "Storlek"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
-#, fuzzy
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
-msgstr "Skrivarinställningar"
+msgstr "Grundläggande skrivarinställningar"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
-#, fuzzy
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
-msgstr "Storlek på pappret som du vill skriva ut till"
+msgstr "Storlek på pappret som du vill skriva ut till"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "Mediatyp"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
-msgstr ""
+msgstr "Typ av media (vanligt papper, fotopapper, etc.)"
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
-msgstr "Mediakälla"
+msgstr "Mediakälla"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
#, fuzzy
msgid "Source (input slot) of the media"
-msgstr "Källa (inmatningsfack) med media som du skriver ut till"
+msgstr "Källa (inmatningsfack) med media som du skriver ut till"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
-msgstr "Upplösning"
+msgstr "Upplösning"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
-msgstr "Upplösning och kvalitet på utskriften"
+msgstr "Upplösning och kvalitet på utskriften"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
-msgstr "Bläcktyp"
+msgstr "Bläcktyp"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
-msgstr ""
+msgstr "Avancerad skrivarkonfiguration"
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
-msgstr "Typ av bläck i skrivaren"
+msgstr "Typ av bläck i skrivaren"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
-msgstr ""
+msgstr "Bläckkanaler"
#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
@@ -462,112 +433,110 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
-msgstr ""
+msgstr "Avancerad skrivarfunktionalitet"
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
-#, fuzzy
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
-msgstr "Skrivarmodell:"
+msgstr "Utskriftsläge"
#: src/main/print-canon.c:1505 src/main/print-color.c:184
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
-#, fuzzy
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
-msgstr "ColorLife-papper"
+msgstr "Kärnparameter"
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
-msgstr ""
+msgstr "Dubbelsidad utskrift"
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
#, fuzzy
msgid "Cyan Density"
msgstr "Intensitet:"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
#, fuzzy
msgid "Adjust the cyan density"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyanbalansen på utskriften"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
#, fuzzy
msgid "Magenta Density"
msgstr "Magenta"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
#, fuzzy
msgid "Adjust the magenta density"
-msgstr "Justera magentabalansen på utskriften"
+msgstr "Justera magentabalansen på utskriften"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
#, fuzzy
msgid "Yellow Density"
msgstr "Intensitet:"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
#, fuzzy
msgid "Adjust the yellow density"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera gulbalansen på utskriften"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
#, fuzzy
msgid "Black Density"
msgstr "Intensitet:"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
#, fuzzy
msgid "Adjust the black density"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyanbalansen på utskriften"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
#, fuzzy
msgid "Light Cyan Transition"
msgstr "Ljus cyan"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
-msgstr ""
+msgstr "Avancerad bläckjustering"
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
#, fuzzy
msgid "Light Magenta Transition"
msgstr "Ljus magenta"
@@ -577,15 +546,15 @@ msgstr "Ljus magenta"
msgid "Light Yellow Transition"
msgstr "Ljus cyan"
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
-msgstr ""
+msgstr "Av"
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
-msgstr ""
+msgstr "Kort kant (Vänd)"
#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
msgid "Auto Sheet Feeder"
@@ -606,63 +575,61 @@ msgstr "Matte-papper"
#: src/main/print-canon.c:1924
msgid "CD tray"
-msgstr ""
+msgstr "Cd-lucka"
#: src/main/print-canon.c:2049
msgid "Photo CcMmYK Color"
-msgstr "CcMmYK-fotofärg"
+msgstr "CcMmYK-fotofärg"
#: src/main/print-canon.c:2052
msgid "Photo CcMmY Color"
-msgstr "CcMmY-fotofärg"
+msgstr "CcMmY-fotofärg"
#: src/main/print-canon.c:2055
msgid "CMYK Color"
-msgstr "CMYK-färg"
+msgstr "CMYK-färg"
#: src/main/print-canon.c:2058
msgid "CMY Color"
-msgstr "CMY-färg"
+msgstr "CMY-färg"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "Svart"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
-msgstr "Färg"
+msgstr "Färg"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
-#, fuzzy
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
-msgstr "Svartvitt"
+msgstr "Svart och vitt"
#: src/main/print-color.c:50
msgid "High Accuracy"
-msgstr ""
+msgstr "Hög träffsäkerhet"
#: src/main/print-color.c:51
-#, fuzzy
msgid "Bright Colors"
-msgstr "Justera utskriftsfärg"
+msgstr "Ljusa färger"
#: src/main/print-color.c:52
msgid "Correct Hue Only"
-msgstr ""
+msgstr "Justera endast färgton"
#: src/main/print-color.c:53
msgid "Uncorrected"
@@ -670,15 +637,15 @@ msgstr ""
#: src/main/print-color.c:54
msgid "Desaturated"
-msgstr ""
+msgstr "Omättad"
#: src/main/print-color.c:55
msgid "Threshold"
-msgstr ""
+msgstr "Tröskelvärde"
#: src/main/print-color.c:57 src/main/print-color.c:133
msgid "Raw"
-msgstr ""
+msgstr "RÃ¥"
#: src/main/print-color.c:58
#, fuzzy
@@ -689,38 +656,35 @@ msgstr "Skriv ut"
#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
msgid "Grayscale"
-msgstr "Gråtoner"
+msgstr "Gråtoner"
#: src/main/print-color.c:123
-#, fuzzy
msgid "Whitescale"
-msgstr "Gult"
+msgstr "Vitskala"
#: src/main/print-color.c:125
msgid "RGB"
-msgstr ""
+msgstr "RGB"
#: src/main/print-color.c:127
msgid "CMY"
-msgstr ""
+msgstr "CMY"
#: src/main/print-color.c:129
msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
#: src/main/print-color.c:131
msgid "KCMY"
-msgstr ""
+msgstr "KCMY"
#: src/main/print-color.c:165 src/main/print-color.c:446
-#, fuzzy
msgid "Channel "
-msgstr "Avbryt"
+msgstr "Kanal "
#: src/main/print-color.c:165
-#, fuzzy
msgid " Gamma"
-msgstr "Gamma:"
+msgstr " Gamma"
#: src/main/print-color.c:165 src/main/print-color.c:216
#: src/main/print-color.c:248 src/main/print-color.c:258
@@ -728,9 +692,8 @@ msgstr "Gamma:"
#: src/main/print-color.c:282 src/main/print-color.c:290
#: src/main/print-color.c:298 src/main/print-color.c:306
#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
-#, fuzzy
msgid "Gamma"
-msgstr "Gamma:"
+msgstr "Gamma"
#: src/main/print-color.c:166
msgid "Gamma for raw channel "
@@ -738,17 +701,17 @@ msgstr ""
#: src/main/print-color.c:176
msgid "Color Correction"
-msgstr ""
+msgstr "Färgjustering"
#: src/main/print-color.c:176 src/main/print-color.c:224
#: src/main/print-color.c:232 src/main/print-color.c:346
#: src/main/generic-options.c:68
msgid "Basic Image Adjustment"
-msgstr ""
+msgstr "Grundläggande bildjustering"
#: src/main/print-color.c:177
msgid "Color correction to be applied"
-msgstr ""
+msgstr "Färgjustering att verkställas"
#: src/main/print-color.c:184
msgid "Channel Bit Depth"
@@ -756,7 +719,7 @@ msgstr ""
#: src/main/print-color.c:185
msgid "Bit depth per channel"
-msgstr ""
+msgstr "Bitdjup per kanal"
#: src/main/print-color.c:192
#, fuzzy
@@ -781,7 +744,7 @@ msgstr "Utdatatyp:"
#: src/main/print-color.c:208 src/main/print-color.c:209
#: src/main/print-escp2.c:326
msgid "Raw Channels"
-msgstr ""
+msgstr "RÃ¥kanaler"
#: src/main/print-color.c:216
#, fuzzy
@@ -793,32 +756,28 @@ msgid "Do not correct for screen gamma"
msgstr ""
#: src/main/print-color.c:224
-#, fuzzy
msgid "Brightness"
-msgstr "Ljusstyrka:"
+msgstr "Ljusstyrka"
#: src/main/print-color.c:225
-#, fuzzy
msgid "Brightness of the print"
-msgstr "Ställ in bredden på utskriften"
+msgstr "Ljusstyrka för utskriften"
#: src/main/print-color.c:232
-#, fuzzy
msgid "Contrast"
-msgstr "Kontrast:"
+msgstr "Kontrast"
#: src/main/print-color.c:233
msgid "Contrast of the print (0 is solid gray)"
-msgstr ""
+msgstr "Kontrast för utskriften (0 är helgrå)"
#: src/main/print-color.c:240
msgid "Linear Contrast Adjustment"
-msgstr ""
+msgstr "Linjär konstrastjustering"
#: src/main/print-color.c:240
-#, fuzzy
msgid "Advanced Image Control"
-msgstr "Utdatatyp:"
+msgstr "Avancerad bildkontroll"
#: src/main/print-color.c:241
msgid "Use linear vs. fixed end point contrast adjustment"
@@ -834,10 +793,10 @@ msgid ""
"Adjust the gamma of the print. Larger values will produce a generally "
"brighter print, while smaller values will produce a generally darker print. "
msgstr ""
-"Justera gammavärdet på utskriften. Större värden kommer att skapa en i "
-"allmänhet ljusare utskrift, medan mindre värden kommer att skapa en mörkare "
-"utskrift. Svart och vitt kommer att vara samma, till skillnad från då "
-"ljusstyrkeinställningen används."
+"Justera gammavärdet på utskriften. Större värden kommer att skapa en i "
+"allmänhet ljusare utskrift, medan mindre värden kommer att skapa en mörkare "
+"utskrift. Svart och vitt kommer att vara samma, till skillnad från då "
+"ljusstyrkeinställningen används."
#: src/main/print-color.c:258
#, fuzzy
@@ -848,149 +807,134 @@ msgstr "Gamma:"
msgid "Gamma value assumed by application"
msgstr ""
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "Cyan"
#: src/main/print-color.c:267
-#, fuzzy
msgid "Adjust the cyan gamma"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyangamma"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "Magenta"
#: src/main/print-color.c:275
-#, fuzzy
msgid "Adjust the magenta gamma"
-msgstr "Justera magentabalansen på utskriften"
+msgstr "Justera magentagamma"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
-msgstr "Gult"
+msgstr "Gul"
#: src/main/print-color.c:283
-#, fuzzy
msgid "Adjust the yellow gamma"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera gulgamma"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
-msgstr ""
+msgstr "Röd"
#: src/main/print-color.c:291
-#, fuzzy
msgid "Adjust the red gamma"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera rödgamma"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
-msgstr ""
+msgstr "Grön"
#: src/main/print-color.c:299
-#, fuzzy
msgid "Adjust the green gamma"
-msgstr "Justera magentabalansen på utskriften"
+msgstr "Justera gröngamma"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
-msgstr ""
+msgstr "Blå"
#: src/main/print-color.c:307
-#, fuzzy
msgid "Adjust the blue gamma"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera blågamma"
#: src/main/print-color.c:315
-#, fuzzy
msgid "Adjust the black gamma"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera svartgamma"
#: src/main/print-color.c:322 src/main/print-olympus.c:1330
msgid "Cyan Balance"
-msgstr ""
+msgstr "Cyanbalans"
#: src/main/print-color.c:322 src/main/print-color.c:330
#: src/main/print-color.c:338
-#, fuzzy
msgid "GrayBalance"
-msgstr "Gråtoner"
+msgstr "Gråbalans"
#: src/main/print-color.c:323
-#, fuzzy
msgid "Adjust the cyan gray balance"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyan-gråbalansen"
#: src/main/print-color.c:330 src/main/print-olympus.c:1338
-#, fuzzy
msgid "Magenta Balance"
-msgstr "Magenta"
+msgstr "Magentabalans"
#: src/main/print-color.c:331
-#, fuzzy
msgid "Adjust the magenta gray balance"
-msgstr "Justera magentabalansen på utskriften"
+msgstr "Justera magenta-gråbalansen"
#: src/main/print-color.c:338 src/main/print-olympus.c:1346
-#, fuzzy
msgid "Yellow Balance"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Gulbalans"
#: src/main/print-color.c:339
-#, fuzzy
msgid "Adjust the yellow gray balance"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera gul-gråbalansen"
#: src/main/print-color.c:346
-#, fuzzy
msgid "Saturation"
-msgstr "Mättnad:"
+msgstr "Mättnad"
#: src/main/print-color.c:347
msgid ""
"Adjust the saturation (color balance) of the print\n"
"Use zero saturation to produce grayscale output using color and black inks"
msgstr ""
-"Justera mättnaden (färgbalansen) på utskriften\n"
-"Använd noll som mättnad för att skapa gråskaleutdata med färgbläck och svart "
-"bläck"
+"Justera mättnaden (färgbalansen) på utskriften\n"
+"Använd noll som mättnad för att skapa gråskaleutdata med färgbläck och svart "
+"bläck"
#: src/main/print-color.c:357
-#, fuzzy
msgid "Ink Limit"
-msgstr "Bläcktyp"
+msgstr "Bläckgräns"
#: src/main/print-color.c:357 src/main/print-color.c:365
#: src/main/print-color.c:373 src/main/print-color.c:381
@@ -1030,9 +974,8 @@ msgid "Upper bound of gray component reduction"
msgstr ""
#: src/main/print-color.c:446
-#, fuzzy
msgid " Curve"
-msgstr "Svart"
+msgstr " Kurva"
#: src/main/print-color.c:447 src/main/print-color.c:457
#: src/main/print-color.c:465 src/main/print-color.c:473
@@ -1045,104 +988,88 @@ msgstr "Utdatatyp:"
#: src/main/print-color.c:447
msgid "Curve for raw channel "
-msgstr ""
+msgstr "Kurva för råkanal"
#: src/main/print-color.c:457
msgid "Cyan Curve"
-msgstr ""
+msgstr "Cyankurva"
#: src/main/print-color.c:458
-#, fuzzy
msgid "Cyan curve"
-msgstr "Avbryt"
+msgstr "Cyankurva"
#: src/main/print-color.c:465
-#, fuzzy
msgid "Magenta Curve"
-msgstr "Magenta"
+msgstr "Magentakurva"
#: src/main/print-color.c:466
-#, fuzzy
msgid "Magenta curve"
-msgstr "Magenta"
+msgstr "Magentakurva"
#: src/main/print-color.c:473
-#, fuzzy
msgid "Yellow Curve"
-msgstr "Gult"
+msgstr "Gulkurva"
#: src/main/print-color.c:474
-#, fuzzy
msgid "Yellow curve"
-msgstr "Gult"
+msgstr "Gulkurva"
#: src/main/print-color.c:481
-#, fuzzy
msgid "Black Curve"
-msgstr "Svart"
+msgstr "Svartkurva"
#: src/main/print-color.c:482
-#, fuzzy
msgid "Black curve"
-msgstr "Svart"
+msgstr "Svartkurva"
#: src/main/print-color.c:489
-#, fuzzy
msgid "Red Curve"
-msgstr "Gult"
+msgstr "Rödkurva"
#: src/main/print-color.c:490
-#, fuzzy
msgid "Red curve"
-msgstr "Gult"
+msgstr "Rödkurva"
#: src/main/print-color.c:497
-#, fuzzy
msgid "Green Curve"
-msgstr "Magenta"
+msgstr "Grönkurva"
#: src/main/print-color.c:498
-#, fuzzy
msgid "Green curve"
-msgstr "Magenta"
+msgstr "Grönkurva"
#: src/main/print-color.c:505
-#, fuzzy
msgid "Blue Curve"
-msgstr "Svart"
+msgstr "Blåkurva"
#: src/main/print-color.c:506
-#, fuzzy
msgid "Blue curve"
-msgstr "Svart"
+msgstr "Blåkurva"
#: src/main/print-color.c:513
-#, fuzzy
msgid "White Curve"
-msgstr "Gult"
+msgstr "Vitkurva"
#: src/main/print-color.c:514
-#, fuzzy
msgid "White curve"
-msgstr "Gult"
+msgstr "Vitkurva"
#: src/main/print-color.c:521
msgid "Hue Map"
-msgstr ""
+msgstr "Färgtonskarta"
#: src/main/print-color.c:521 src/main/print-color.c:529
#: src/main/print-color.c:537
msgid "Advanced HSL Curves"
-msgstr ""
+msgstr "Avancerade HSL-kurvor"
#: src/main/print-color.c:522
msgid "Hue adjustment curve"
msgstr ""
#: src/main/print-color.c:529
-#, fuzzy
msgid "Saturation Map"
-msgstr "Mättnad:"
+msgstr "Mättnadskarta"
#: src/main/print-color.c:530
msgid "Saturation adjustment curve"
@@ -1171,22 +1098,22 @@ msgstr ""
#: src/main/printers.c:503
#, c-format
msgid "Value must be set for %s\n"
-msgstr ""
+msgstr "Värde måste ställas in för %s\n"
#: src/main/printers.c:516 src/main/printers.c:521
-#, fuzzy, c-format
+#, c-format
msgid "`%s' is not a valid %s\n"
-msgstr "%s är inte en giltig %s\n"
+msgstr "\"%s\" är inte en giltig %s\n"
#: src/main/printers.c:540
#, c-format
msgid "%s must be between %f and %f (is %f)\n"
-msgstr ""
+msgstr "%s måste vara mellan %f och %f (är %f)\n"
#: src/main/printers.c:562 src/main/printers.c:586
#, c-format
msgid "%s must be between %d and %d (is %d)\n"
-msgstr ""
+msgstr "%s måste vara mellan %d och %d (är %d)\n"
#: src/main/printers.c:617
#, c-format
@@ -1207,39 +1134,38 @@ msgid "wrap around"
msgstr ""
#: src/main/printers.c:673
-#, fuzzy, c-format
+#, c-format
msgid "Unknown type parameter %s (%d)\n"
-msgstr "Okänd skrivare %s\n"
+msgstr "Okänd typparameter %s (%d)\n"
#: src/main/printers.c:686 src/main/printers.c:697
#, c-format
msgid "%s out of range (value %d, min %d, max %d)\n"
-msgstr "%s är utanför intervallet (värde %d, min %d, max %d)\n"
+msgstr "%s är utanför intervallet (värde %d, min %d, max %d)\n"
#: src/main/printers.c:755
-#, fuzzy
msgid "Page size is not valid\n"
-msgstr "Bildstorleken är inte giltig\n"
+msgstr "Pappersstorleken är inte giltig\n"
#: src/main/printers.c:776
#, fuzzy, c-format
msgid "Top margin must not be less than %d\n"
-msgstr "Övre marginalen får inte vara negativ\n"
+msgstr "Övre marginalen får inte vara negativ\n"
#: src/main/printers.c:782
#, fuzzy, c-format
msgid "Left margin must not be less than %d\n"
-msgstr "Vänstermarginalen får inte vara negativ\n"
+msgstr "Vänstermarginalen får inte vara negativ\n"
#: src/main/printers.c:788
#, fuzzy
msgid "Height must be greater than zero\n"
-msgstr "Vänstermarginalen får inte vara negativ\n"
+msgstr "Vänstermarginalen får inte vara negativ\n"
#: src/main/printers.c:794
#, fuzzy
msgid "Width must be greater than zero\n"
-msgstr "Övre marginalen får inte vara negativ\n"
+msgstr "Övre marginalen får inte vara negativ\n"
#: src/main/printers.c:800
#, c-format
@@ -1247,6 +1173,8 @@ msgid ""
"Image is too wide for the page: left margin is %d, width %d, right edge is %"
"d\n"
msgstr ""
+"Bilden är för bred för sidan: vänstermarginalen är %d, bredd %d, högerkanten "
+"är %d\n"
#: src/main/printers.c:807
#, c-format
@@ -1254,182 +1182,172 @@ msgid ""
"Image is too long for the page: top margin is %d, height %d, bottom edge is %"
"d\n"
msgstr ""
+"Bilden är för lång för sidan: övre marginal är %d, höjd %d, nedre kanten är %"
+"d\n"
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "Standard"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr "Rullmatning"
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
-#, fuzzy
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
-msgstr "Manuell"
+msgstr "Manuell matning"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
-#, fuzzy
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
-msgstr "Skriv ut till fil?"
+msgstr "Skriv ut till cd"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
-msgstr "Manuell"
+msgstr "Manuell matning"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
-msgstr "Manuell"
+msgstr "Manuell matning"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
#, fuzzy
msgid "Rear Tray"
msgstr "Fack"
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
-msgstr "Fotopapper"
+msgstr "Fotosvart"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
#, fuzzy
msgid "Cut Sheet Autoselect"
-msgstr "Välj automatiskt"
+msgstr "Välj automatiskt"
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
-msgstr ""
+msgstr "Snabb ekonomi"
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
-msgstr ""
+msgstr "Ekonomi"
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
-msgstr ""
+msgstr "Utdrag"
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
-#, fuzzy
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
-msgstr "Höjd:"
+msgstr "Hög"
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
-#, fuzzy
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
-msgstr "Fotografi"
+msgstr "Foto"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
#, fuzzy
msgid "Super Photo"
msgstr "Stylus Photo"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
#, fuzzy
msgid "Ultra Photo"
-msgstr "Sexfärgs foto"
+msgstr "Sexfärgs foto"
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
-msgstr ""
+msgstr "Bästa"
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
-#, fuzzy
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr "Ljus cyan"
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
-#, fuzzy
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
msgstr "Ljus magenta"
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
-#, fuzzy
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
-msgstr "Svart"
+msgstr "Ljus svart"
-#: src/main/print-escp2-data.c:810
-#, fuzzy
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
-msgstr "Gult"
+msgstr "Mörk gul"
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
-#, fuzzy
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
-msgstr "Matte-papper"
+msgstr "Matt svart"
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
-#, fuzzy
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
-msgstr "Fotopapper"
+msgstr "Fotosvart"
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
-#, fuzzy
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
-msgstr "Glansig film"
+msgstr "Glansoptimerare"
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
-#, fuzzy
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
-msgstr "Svart"
+msgstr "Ljus-ljus svart"
#: src/main/print-escp2.c:159
msgid "Automatic Printing Mode"
-msgstr ""
+msgstr "Automatiskt utskriftsläge"
#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
#: src/main/generic-options.c:62
@@ -1438,13 +1356,12 @@ msgstr ""
#: src/main/print-escp2.c:160
msgid "Automatic printing mode"
-msgstr ""
+msgstr "Automatiskt utskriftsläge"
#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
msgid "Print Quality"
-msgstr "720 DPI högsta kvalitet"
+msgstr "Utskriftskvalitet"
#: src/main/print-escp2.c:195
msgid "CD Hub Size"
@@ -1467,22 +1384,21 @@ msgid "CD Vertical Fine Adjustment"
msgstr ""
#: src/main/print-escp2.c:214
-#, fuzzy
msgid "Resolution of the print"
-msgstr "Upplösning och kvalitet på utskriften"
+msgstr "Upplösning på utskriften"
#: src/main/print-escp2.c:230
msgid "Enhanced Gloss"
-msgstr ""
+msgstr "Förbättrat glansig"
#: src/main/print-escp2.c:231
msgid "Add gloss enhancement"
-msgstr ""
+msgstr "Lägg till glansförbättring"
#: src/main/print-escp2.c:236
#, fuzzy
msgid "Ink Set"
-msgstr "Bläcktyp"
+msgstr "Bläcktyp"
#: src/main/print-escp2.c:242
msgid "Printing Direction"
@@ -1531,12 +1447,12 @@ msgstr ""
#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
msgid "Alignment Choices"
-msgstr ""
+msgstr "Justeringsval"
#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
#, fuzzy
msgid "Ink change command"
-msgstr "Okänt kommando.\n"
+msgstr "Okänt kommando.\n"
#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
msgid "Alternate Alignment Passes"
@@ -1544,211 +1460,196 @@ msgstr ""
#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
#: src/main/print-escp2.c:303
-#, fuzzy
msgid "Alternate Alignment Choices"
-msgstr "Upprepar justeringsprocessen.\n"
+msgstr "Alternativa justeringsval"
#: src/main/print-escp2.c:302
msgid "Supports Packet Mode"
msgstr ""
#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
-#, fuzzy
msgid "Channel Names"
-msgstr "Avbryt"
+msgstr "Kanalnamn"
#: src/main/print-escp2.c:327
msgid "Raw Channel Count"
msgstr ""
#: src/main/print-escp2.c:332
-#, fuzzy
msgid "Cyan Map"
-msgstr "Cyan"
+msgstr "Cyankarta"
#: src/main/print-escp2.c:333
-#, fuzzy
msgid "Adjust the cyan map"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyankartan"
#: src/main/print-escp2.c:338
-#, fuzzy
msgid "Magenta Map"
-msgstr "Magenta"
+msgstr "Magentakarta"
#: src/main/print-escp2.c:339
-#, fuzzy
msgid "Adjust the magenta map"
-msgstr "Justera magentabalansen på utskriften"
+msgstr "Justera magentakartan"
#: src/main/print-escp2.c:344
-#, fuzzy
msgid "Yellow Map"
-msgstr "Gult"
+msgstr "Gulkarta"
#: src/main/print-escp2.c:345
-#, fuzzy
msgid "Adjust the yellow map"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera gulkartan"
#: src/main/print-escp2.c:350
-#, fuzzy
msgid "Blue Map"
-msgstr "Svartvitt"
+msgstr "Blåkarta"
#: src/main/print-escp2.c:351
-#, fuzzy
msgid "Adjust the blue map"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera blåkartan"
#: src/main/print-escp2.c:356
msgid "Red Map"
-msgstr ""
+msgstr "Rödkarta"
#: src/main/print-escp2.c:357
-#, fuzzy
msgid "Adjust the red map"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera rödkartan"
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
#, fuzzy
msgid "Red Density"
msgstr "Intensitet:"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
#, fuzzy
msgid "Adjust the red density"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera gulbalansen på utskriften"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
#, fuzzy
msgid "Blue Density"
msgstr "Intensitet:"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
#, fuzzy
msgid "Adjust the blue density"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyanbalansen på utskriften"
-#: src/main/print-escp2.c:461
-#, fuzzy
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
-msgstr "Glansig film"
+msgstr "Glansnivå"
-#: src/main/print-escp2.c:462
-#, fuzzy
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera glansnivån"
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
#, fuzzy
msgid "Light Gray Transition"
msgstr "Ljus cyan"
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
#, fuzzy
msgid "Dark Gray Transition"
msgstr "Ljus cyan"
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
#, fuzzy
msgid "Mid Gray Transition"
msgstr "Ljus cyan"
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
#, fuzzy
msgid "Medium Gray Transition"
msgstr "Ljus cyan"
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
#, fuzzy
msgid "Full Manual Control"
msgstr "Utdatatyp:"
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
-msgstr ""
+msgstr "CD - 5 tum"
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
-msgstr ""
+msgstr "CD - 3 tum"
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
-msgstr ""
+msgstr "Normal"
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
#, fuzzy
msgid "Print To Hub"
msgstr "Skriv ut till fil?"
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
#, fuzzy
msgid "Manual Control"
msgstr "Utdatatyp:"
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
-#, fuzzy
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
-msgstr "Storlek"
+msgstr "Automatisk"
-#: src/main/print-escp2.c:1621
-#, fuzzy
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
-msgstr "600 DPI enkelriktad"
+msgstr "Dubbelriktad"
-#: src/main/print-escp2.c:1623
-#, fuzzy
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
-msgstr "600 DPI enkelriktad"
+msgstr "Enkelriktad"
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
-msgstr ""
+msgstr "Undvik närmaste granne"
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, fuzzy, c-format
msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "Skrivaren stöder inte färgutskrift\n"
+msgstr "Skrivaren stöder inte färgutskrift\n"
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
-msgstr ""
+msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n"
#: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
msgid "300 DPI x 600 DPI"
-msgstr "300 DPI × 600 DPI"
+msgstr "300 DPI × 600 DPI"
#: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
msgid "600 DPI"
@@ -1756,7 +1657,7 @@ msgstr "600 DPI"
#: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
msgid "600 DPI high quality"
-msgstr "600 DPI hög kvalitet"
+msgstr "600 DPI hög kvalitet"
#: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
msgid "600 DPI Unidirectional"
@@ -1768,11 +1669,11 @@ msgstr "1200 DPI"
#: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
msgid "1200 DPI high quality"
-msgstr "1200 DPI hög kvalitet"
+msgstr "1200 DPI hög kvalitet"
#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
msgid "1200 DPI highest quality"
-msgstr "1200 DPI högsta kvalitet"
+msgstr "1200 DPI högsta kvalitet"
#: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
msgid "1200 DPI Unidirectional"
@@ -1780,15 +1681,15 @@ msgstr "1200 DPI enkelriktad"
#: src/main/print-lexmark.c:585
msgid "2400 DPI x 1200 DPI"
-msgstr "2400 DPI × 1200 DPI"
+msgstr "2400 DPI × 1200 DPI"
#: src/main/print-lexmark.c:586
msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI × 1200 DPI hög kvalitet"
+msgstr "2400 DPI × 1200 DPI hög kvalitet"
#: src/main/print-lexmark.c:587
msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI × 1200 DPI högsta kvalitet"
+msgstr "2400 DPI × 1200 DPI högsta kvalitet"
#: src/main/print-lexmark.c:589
msgid "test print"
@@ -1802,7 +1703,7 @@ msgstr "testutskrift"
#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
msgid "Four Color Standard"
-msgstr "Fyrfärgs standard"
+msgstr "Fyrfärgs standard"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
@@ -1812,7 +1713,7 @@ msgstr "Fyrfärgs standard"
#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
#: src/main/escp2-channels.c:1129
msgid "Three Color Composite"
-msgstr "Trefärgers sammansatt"
+msgstr "Trefärgers sammansatt"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
@@ -1821,7 +1722,7 @@ msgstr "Trefärgers sammansatt"
#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
#: src/main/escp2-channels.c:1662
msgid "Six Color Photo"
-msgstr "Sexfärgs foto"
+msgstr "Sexfärgs foto"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
@@ -1829,7 +1730,7 @@ msgstr "Sexfärgs foto"
#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
msgid "Five Color Photo Composite"
-msgstr "Femfärgsfoto sammansatt"
+msgstr "Femfärgsfoto sammansatt"
#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
@@ -1857,14 +1758,14 @@ msgstr "Matte-papper"
#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
#: src/main/escp2-papers.c:1406
msgid "Inkjet Paper"
-msgstr "Bläckstrålepapper"
+msgstr "Bläckstrålepapper"
#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
#: src/main/escp2-papers.c:1408
msgid "Photo Quality Inkjet Paper"
-msgstr "Bläckstrålepapper med fotokvalitet"
+msgstr "Bläckstrålepapper med fotokvalitet"
#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
@@ -1905,53 +1806,46 @@ msgstr "Tungt Ilford-papper"
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
-msgstr ""
+msgstr "Inget"
#: src/main/print-olympus.c:859
-#, fuzzy
msgid "Glossy"
-msgstr "Glansig film"
+msgstr "Glansig"
#: src/main/print-olympus.c:860
msgid "Texture"
-msgstr ""
+msgstr "Textur"
#: src/main/print-olympus.c:861
-#, fuzzy
msgid "Matte"
-msgstr "Matte-papper"
+msgstr "Matt"
#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
msgid "Laminate Pattern"
-msgstr ""
+msgstr "Laminatmönster"
#: src/main/print-olympus.c:1331
-#, fuzzy
msgid "Adjust the cyan balance"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera cyanbalansen"
#: src/main/print-olympus.c:1339
-#, fuzzy
msgid "Adjust the magenta balance"
-msgstr "Justera magentabalansen på utskriften"
+msgstr "Justera magentabalansen"
#: src/main/print-olympus.c:1347
-#, fuzzy
msgid "Adjust the yellow balance"
-msgstr "Justera gulbalansen på utskriften"
+msgstr "Justera gulbalansen"
#: src/main/print-olympus.c:1354
-#, fuzzy
msgid "Black Balance"
-msgstr "Svartvitt"
+msgstr "Svartbalans"
#: src/main/print-olympus.c:1355
-#, fuzzy
msgid "Adjust the black balance"
-msgstr "Justera cyanbalansen på utskriften"
+msgstr "Justera svartbalansen"
#: src/main/print-pcl.c:182
msgid "Plain"
@@ -2015,42 +1909,40 @@ msgstr "Fack"
#: src/main/print-pcl.c:238
msgid "Optional Source"
-msgstr "Valfri källa"
+msgstr "Valfri källa"
#: src/main/print-pcl.c:239
msgid "Autoselect"
-msgstr "Välj automatiskt"
+msgstr "Välj automatiskt"
#: src/main/print-pcl.c:256
msgid "600x600 DPI monochrome"
-msgstr "600×600 DPI enfärgad"
+msgstr "600×600 DPI enfärgad"
#: src/main/print-pcl.c:259
msgid "2400x600 DPI"
-msgstr "2400×600 DPI"
+msgstr "2400×600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
-msgstr "Färgpatroner + svarta patroner"
+msgstr "Färgpatroner + svarta patroner"
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
-msgstr "Färgpatroner + fotopatroner"
+msgstr "Färgpatroner + fotopatroner"
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "LÃ¥ng kant (Standard)"
-#: src/main/print-ps.c:96
-#, fuzzy
+#: src/main/print-ps.c:97
msgid "PPDFile"
-msgstr "PPD-fil:"
+msgstr "PPD-fil"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
-#, fuzzy
msgid "PPD File"
-msgstr "PPD-fil?"
+msgstr "PPD-fil"
#: src/main/print-raw.c:223
msgid "Image dimensions must match paper dimensions"
@@ -2058,12 +1950,11 @@ msgstr ""
#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
msgid "Two Level Grayscale"
-msgstr "Tvånivås gråton"
+msgstr "Tvånivås gråton"
#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
-#, fuzzy
msgid "Three Level Grayscale"
-msgstr "Tvånivås gråton"
+msgstr "Trenivåers gråton"
#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
@@ -2076,110 +1967,96 @@ msgstr "Quadtone"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
msgid "Six Color Enhanced Composite"
-msgstr "Sexfärgs förbättrad sammansatt"
+msgstr "Sexfärgs förbättrad sammansatt"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
msgid "Seven Color Photo"
-msgstr "Sjufärgs foto"
+msgstr "Sjufärgs foto"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1498
msgid "Seven Color Enhanced"
-msgstr "Sjufärgs förbättrad"
+msgstr "Sjufärgs förbättrad"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1535
-#, fuzzy
msgid "Eight Color Photo"
-msgstr "Sexfärgs foto"
+msgstr "Åttafärgers foto"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
-#, fuzzy
msgid "One Color Raw"
-msgstr "Sjufärgs foto"
+msgstr "Enfärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1695
-#, fuzzy
msgid "One Color Raw Enhanced Gloss"
-msgstr "Sjufärgs förbättrad"
+msgstr "Enfärgers rå förbättrad glansig"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
-#, fuzzy
msgid "Two Color Raw"
-msgstr "Fyrfärgs standard"
+msgstr "Tvåfärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
#: src/main/escp2-channels.c:1829
-#, fuzzy
msgid "Three Color Raw"
-msgstr "Trefärgers sammansatt"
+msgstr "Trefärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1762
-#, fuzzy
msgid "Three Color Raw Gloss"
-msgstr "Trefärgers sammansatt"
+msgstr "Trefärgers rå glansig"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
-#, fuzzy
msgid "Four Color Raw"
-msgstr "Fyrfärgs standard"
+msgstr "Fyrfärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1884
-#, fuzzy
msgid "Four Color Raw Gloss"
-msgstr "Fyrfärgs standard"
+msgstr "Fyrfärgers rå glansig"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
-#, fuzzy
msgid "Five Color Raw"
-msgstr "Sjufärgs foto"
+msgstr "Femfärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
-#, fuzzy
msgid "Six Color Raw"
-msgstr "Sexfärgs foto"
+msgstr "Sexfärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1962
-#, fuzzy
msgid "Six Color Enhanced Gloss Raw"
-msgstr "Sexfärgs förbättrad sammansatt"
+msgstr "Sexfärgers förbättrad glansig rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
#: src/main/escp2-channels.c:2007
-#, fuzzy
msgid "Seven Color Raw"
-msgstr "Sjufärgs foto"
+msgstr "Sjufärgers rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:2024
-#, fuzzy
msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sjufärgs förbättrad"
+msgstr "Sjufärgers förbättrad glansig rå"
# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
#: src/main/escp2-channels.c:2042
-#, fuzzy
msgid "Eight Color Raw"
-msgstr "Sexfärgs foto"
+msgstr "Åttafärgers rå"
#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
@@ -2195,7 +2072,7 @@ msgstr ""
#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
#, fuzzy
msgid "UltraChrome Photo Black"
-msgstr "Sexfärgs foto"
+msgstr "Sexfärgs foto"
#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
msgid "UltraChrome Matte Black"
@@ -2223,21 +2100,18 @@ msgstr "Bakljusfilm"
#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
-#, fuzzy
msgid "Matte Paper Heavyweight"
-msgstr "Matte-papper"
+msgstr "Matt tungt papper"
#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
-#, fuzzy
msgid "Premium Semigloss Photo Paper"
-msgstr "Premiumglansigt fotopapper"
+msgstr "Premium halvglansigt fotopapper"
#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
-#, fuzzy
msgid "ColorLife Paper"
msgstr "ColorLife-papper"
@@ -2254,149 +2128,128 @@ msgstr ""
#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
msgid "360 x 90 DPI Fast Economy"
-msgstr ""
+msgstr "360 × 90 DPI snabb ekonomi"
#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
msgid "360 x 120 DPI Economy"
-msgstr "600×600 DPI enfärgad"
+msgstr "360 × 120 DPI ekonomi"
#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
msgid "180 DPI Economy"
-msgstr ""
+msgstr "180 DPI ekonomi"
#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
-#, fuzzy
msgid "360 x 180 DPI Draft"
-msgstr "150×150 DPI"
+msgstr "360 × 180 DPI utdrag"
#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
msgid "360 x 240 DPI Draft"
-msgstr "600×600 DPI"
+msgstr "360 × 240 DPI utdrag"
#: src/main/escp2-resolutions.c:68
-#, fuzzy
msgid "360 DPI High Quality"
-msgstr "1440 × 360 DPI hög kvalitet"
+msgstr "360 DPI hög kvalitet"
#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
#: src/main/escp2-resolutions.c:77
-#, fuzzy
msgid "360 DPI"
-msgstr "600 DPI"
+msgstr "360 DPI"
#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
-#, fuzzy
msgid "720 x 360 DPI"
-msgstr "720 × 360 DPI"
+msgstr "720 × 360 DPI"
#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
-#, fuzzy
msgid "720 DPI"
-msgstr "1200 DPI"
+msgstr "720 DPI"
#: src/main/escp2-resolutions.c:94
-#, fuzzy
msgid "720 DPI High Quality"
-msgstr "1200 DPI hög kvalitet"
+msgstr "720 DPI hög kvalitet"
#: src/main/escp2-resolutions.c:97
-#, fuzzy
msgid "720 DPI Highest Quality"
-msgstr "1200 DPI högsta kvalitet"
+msgstr "720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:100
-#, fuzzy
msgid "720 x 720 DPI"
-msgstr "2880 × 720 DPI"
+msgstr "720 × 720 DPI"
#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
#: src/main/escp2-resolutions.c:119
-#, fuzzy
msgid "1440 x 720 DPI"
-msgstr "1440 × 720 DPI"
+msgstr "1440 × 720 DPI"
#: src/main/escp2-resolutions.c:110
-#, fuzzy
msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 × 360 DPI högsta kvalitet"
+msgstr "1440 × 720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
-#, fuzzy
msgid "1440 x 720 DPI Transposed"
-msgstr "1440 × 720 DPI"
+msgstr ""
#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
-#, fuzzy
msgid "2880 x 720 DPI"
-msgstr "2880 × 720 DPI"
+msgstr "2880 × 720 DPI"
#: src/main/escp2-resolutions.c:129
-#, fuzzy
msgid "2880 x 720 DPI Highest Quality"
-msgstr "1440 × 360 DPI högsta kvalitet"
+msgstr "2880 × 720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
#: src/main/escp2-resolutions.c:139
-#, fuzzy
msgid "1440 x 1440 DPI"
-msgstr "1440 × 1440 DPI"
+msgstr "1440 × 1440 DPI"
#: src/main/escp2-resolutions.c:142
#, fuzzy
msgid "1440 x 1440"
-msgstr "1440 × 1440 DPI"
+msgstr "1440 × 1440 DPI"
#: src/main/escp2-resolutions.c:145
#, fuzzy
msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 × 360 DPI högsta kvalitet"
+msgstr "1440 × 720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:148
#, fuzzy
msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 × 360 DPI högsta kvalitet"
+msgstr "1440 × 720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
#: src/main/escp2-resolutions.c:161
-#, fuzzy
msgid "2880 x 1440 DPI"
-msgstr "1440 × 1440 DPI"
+msgstr "2880 × 1440 DPI"
#: src/main/escp2-resolutions.c:158
-#, fuzzy
msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 × 1440 DPI"
+msgstr ""
#: src/main/escp2-resolutions.c:164
#, fuzzy
msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 × 360 DPI högsta kvalitet"
+msgstr "2880 × 720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:167
#, fuzzy
msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 × 360 DPI högsta kvalitet"
+msgstr "2880 × 720 DPI högsta kvalitet"
#: src/main/escp2-resolutions.c:171
-#, fuzzy
msgid "5760 x 1440 DPI"
-msgstr "1440 × 1440 DPI"
+msgstr "5760 × 1440 DPI"
#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
-#, fuzzy
msgid "2880 x 2880 DPI"
-msgstr "2880 × 720 DPI"
+msgstr "2880 × 2880 DPI"
#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
-#, fuzzy
msgid "5760 x 2880 DPI"
-msgstr "2880 × 720 DPI"
+msgstr "5760 × 2880 DPI"
#: src/main/escp2-resolutions.c:548
msgid "On"
-msgstr ""
+msgstr "PÃ¥"
#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
#: src/main/escp2-resolutions.c:579
@@ -2407,7 +2260,7 @@ msgstr "Skrivarnamn:"
#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
#: src/main/escp2-resolutions.c:580
msgid "Full Overlap"
-msgstr ""
+msgstr "Full överlappning"
#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
#: src/main/escp2-resolutions.c:581
@@ -2431,18 +2284,17 @@ msgstr "Ljusstyrka:"
#: src/main/generic-options.c:46
msgid "Text"
-msgstr ""
+msgstr "Text"
#: src/main/generic-options.c:47
msgid "Graphics"
-msgstr ""
+msgstr "Grafik"
#: src/main/generic-options.c:48
msgid "Mixed Text and Graphics"
-msgstr ""
+msgstr "Blandat text och grafik"
#: src/main/generic-options.c:49
-#, fuzzy
msgid "Photograph"
msgstr "Fotografi"
@@ -2451,41 +2303,36 @@ msgid "Line Art"
msgstr "Linjegrafik"
#: src/main/generic-options.c:55
-#, fuzzy
msgid "Page"
-msgstr "Storlek"
+msgstr "Sida"
#: src/main/generic-options.c:56
msgid "Job"
-msgstr ""
+msgstr "Jobb"
#: src/main/generic-options.c:68
-#, fuzzy
msgid "Image Type"
-msgstr "Bildtyp:"
+msgstr "Bildtyp"
#: src/main/generic-options.c:69
-#, fuzzy
msgid "Type of image being printed"
-msgstr "Typ av bläck i skrivaren"
+msgstr "Typ av bild som ska skrivas ut"
#: src/main/generic-options.c:74 src/main/generic-options.c:80
msgid "Job Mode"
-msgstr ""
+msgstr "Jobbläge"
#: src/main/generic-options.c:75
msgid "Job vs. page mode"
-msgstr ""
+msgstr "Jobb mot sidläge"
#: src/main/generic-options.c:80
-#, fuzzy
msgid "Page Number"
-msgstr "Storlek"
+msgstr "Sidnummer"
#: src/main/generic-options.c:81
-#, fuzzy
msgid "Page number"
-msgstr "Storlek"
+msgstr "Sidnummer"
#: src/main/xmli18n-tmp.h:1
msgid "Letter"
@@ -2505,40 +2352,40 @@ msgstr "Executive"
#: src/main/xmli18n-tmp.h:8
msgid "3x5"
-msgstr "3×5"
+msgstr "3×5"
#: src/main/xmli18n-tmp.h:9
msgid "4x6"
-msgstr "4×6"
+msgstr "4×6"
#: src/main/xmli18n-tmp.h:10
#, fuzzy
msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Epson 4×6 fotopapper"
+msgstr "Epson 4×6 fotopapper"
#: src/main/xmli18n-tmp.h:11
msgid "5x7"
-msgstr "5×7"
+msgstr "5×7"
#: src/main/xmli18n-tmp.h:12
msgid "5x8"
-msgstr "5×8"
+msgstr "5×8"
#: src/main/xmli18n-tmp.h:13
msgid "6x8"
-msgstr "6×8"
+msgstr "6×8"
#: src/main/xmli18n-tmp.h:14
msgid "8x10"
-msgstr "8×10"
+msgstr "8×10"
#: src/main/xmli18n-tmp.h:16
msgid "12x18"
-msgstr "12×18"
+msgstr "12×18"
#: src/main/xmli18n-tmp.h:17
msgid "Super B 13x19"
-msgstr "Super B 13×19"
+msgstr "Super B 13×19"
#: src/main/xmli18n-tmp.h:18
msgid "Engineering C 17x22"
@@ -2546,44 +2393,43 @@ msgstr ""
#: src/main/xmli18n-tmp.h:19
msgid "8x12"
-msgstr "8×12"
+msgstr "8×12"
#: src/main/xmli18n-tmp.h:20
msgid "11x14"
-msgstr "11×14"
+msgstr "11×14"
#: src/main/xmli18n-tmp.h:21
msgid "16x20"
-msgstr "16×20"
+msgstr "16×20"
#: src/main/xmli18n-tmp.h:22
msgid "16x24"
-msgstr "16×24"
+msgstr "16×24"
#: src/main/xmli18n-tmp.h:23
msgid "20x24"
-msgstr "20×24"
+msgstr "20×24"
#: src/main/xmli18n-tmp.h:24
msgid "20x30"
-msgstr "20×30"
+msgstr "20×30"
#: src/main/xmli18n-tmp.h:25
-#, fuzzy
msgid "22x30"
-msgstr "20×30"
+msgstr "22×30"
#: src/main/xmli18n-tmp.h:26
msgid "24x30"
-msgstr "24×30"
+msgstr "24×30"
#: src/main/xmli18n-tmp.h:27
msgid "Super A1 24x36"
-msgstr ""
+msgstr "Super A1 24x36"
#: src/main/xmli18n-tmp.h:28
msgid "30x40"
-msgstr "30×40"
+msgstr "30×40"
#: src/main/xmli18n-tmp.h:29
msgid "4A"
@@ -2594,9 +2440,8 @@ msgid "2A"
msgstr "2A"
#: src/main/xmli18n-tmp.h:31
-#, fuzzy
msgid "Super A0"
-msgstr "Stylus Photo"
+msgstr "Super A0"
#: src/main/xmli18n-tmp.h:32
msgid "A0"
@@ -2735,9 +2580,8 @@ msgid "B10 ISO"
msgstr "B10 ISO"
#: src/main/xmli18n-tmp.h:66
-#, fuzzy
msgid "Super B0 JIS"
-msgstr "B0 JIS"
+msgstr "Super B0 JIS"
#: src/main/xmli18n-tmp.h:67
msgid "B0 JIS"
@@ -2895,7 +2739,7 @@ msgstr "Crown Quarto"
msgid "Large Crown Quarto"
msgstr "Large crown quarto"
-# får plats
+# får plats
#: src/main/xmli18n-tmp.h:106
msgid "Demy Quarto"
msgstr "Demy quarto"
@@ -2905,9 +2749,8 @@ msgid "Royal Quarto"
msgstr "Royal quarto"
#: src/main/xmli18n-tmp.h:108
-#, fuzzy
msgid "ISO A4"
-msgstr "SRA4"
+msgstr "ISO A4"
#: src/main/xmli18n-tmp.h:109
msgid "Crown Octavo"
@@ -2927,7 +2770,7 @@ msgstr "Royal octavo"
#: src/main/xmli18n-tmp.h:113
msgid "ISO A5"
-msgstr ""
+msgstr "ISO A5"
#: src/main/xmli18n-tmp.h:114
msgid "Small paperback"
@@ -2943,7 +2786,7 @@ msgstr "Stor pingvinpocket"
#: src/main/xmli18n-tmp.h:117
msgid "10cm x 15cm"
-msgstr ""
+msgstr "10cm x 15cm"
#: src/main/xmli18n-tmp.h:118
msgid "Hagaki Card"
@@ -2955,11 +2798,11 @@ msgstr "Oufuku-kort"
#: src/main/xmli18n-tmp.h:120
msgid "Japanese long envelope #3"
-msgstr "Japanskt långt kuvert 3"
+msgstr "Japanskt långt kuvert 3"
#: src/main/xmli18n-tmp.h:121
msgid "Japanese long envelope #4"
-msgstr "Japanskt långt kuvert 4"
+msgstr "Japanskt långt kuvert 4"
#: src/main/xmli18n-tmp.h:122
msgid "Japanese Kaku envelope #4"
@@ -2979,25 +2822,23 @@ msgstr "Monarkkuvert"
#: src/main/xmli18n-tmp.h:126
msgid "4x5 3/8"
-msgstr ""
+msgstr "4x5 3/8"
#: src/main/xmli18n-tmp.h:127
-#, fuzzy
msgid "4x7"
-msgstr "5×7"
+msgstr "4x7"
#: src/main/xmli18n-tmp.h:128
msgid "CP_L"
-msgstr ""
+msgstr "CP_L"
#: src/main/xmli18n-tmp.h:129
msgid "Card"
-msgstr ""
+msgstr "Kort"
#: src/main/xmli18n-tmp.h:130
-#, fuzzy
msgid "Wide Postcard"
-msgstr "Vykort"
+msgstr "Brett vykort"
#: src/main/xmli18n-tmp.h:131
msgid "Chilean Office"
@@ -3053,3197 +2894,3007 @@ msgstr "44 tum rullpapper"
#: src/main/xmli18n-tmp.h:144
msgid "PostScript Level 1"
-msgstr ""
+msgstr "PostScript nivå 1"
#: src/main/xmli18n-tmp.h:145
msgid "PostScript Level 2"
-msgstr ""
+msgstr "PostScript nivå 2"
#: src/main/xmli18n-tmp.h:146
msgid "Canon BJ-30"
-msgstr ""
+msgstr "Canon BJ-30"
#: src/main/xmli18n-tmp.h:147
msgid "Canon BJC-50"
-msgstr ""
+msgstr "Canon BJC-50"
#: src/main/xmli18n-tmp.h:148
msgid "Canon BJC-55"
-msgstr ""
+msgstr "Canon BJC-55"
#: src/main/xmli18n-tmp.h:149
msgid "Canon BJC-80"
-msgstr ""
+msgstr "Canon BJC-80"
#: src/main/xmli18n-tmp.h:150
msgid "Canon BJC-85"
-msgstr ""
+msgstr "Canon BJC-85"
#: src/main/xmli18n-tmp.h:151
msgid "Canon BJC-210"
-msgstr ""
+msgstr "Canon BJC-210"
#: src/main/xmli18n-tmp.h:152
msgid "Canon BJC-240"
-msgstr ""
+msgstr "Canon BJC-240"
#: src/main/xmli18n-tmp.h:153
msgid "Canon BJC-250"
-msgstr ""
+msgstr "Canon BJC-250"
#: src/main/xmli18n-tmp.h:154
msgid "Canon BJC-1000"
-msgstr ""
+msgstr "Canon BJC-1000"
#: src/main/xmli18n-tmp.h:155
msgid "Canon BJC-2000"
-msgstr ""
+msgstr "Canon BJC-2000"
#: src/main/xmli18n-tmp.h:156
msgid "Canon BJC-2010"
-msgstr ""
+msgstr "Canon BJC-2010"
#: src/main/xmli18n-tmp.h:157
msgid "Canon BJC-2100"
-msgstr ""
+msgstr "Canon BJC-2100"
#: src/main/xmli18n-tmp.h:158
msgid "Canon BJC-2110"
-msgstr ""
+msgstr "Canon BJC-2110"
#: src/main/xmli18n-tmp.h:159
msgid "Canon BJC-3000"
-msgstr ""
+msgstr "Canon BJC-3000"
#: src/main/xmli18n-tmp.h:160
msgid "Canon BJC-4000"
-msgstr ""
+msgstr "Canon BJC-4000"
#: src/main/xmli18n-tmp.h:161
msgid "Canon BJC-4300"
-msgstr ""
+msgstr "Canon BJC-4300"
#: src/main/xmli18n-tmp.h:162
msgid "Canon BJC-4400"
-msgstr ""
+msgstr "Canon BJC-4400"
#: src/main/xmli18n-tmp.h:163
msgid "Canon BJC-6000"
-msgstr ""
+msgstr "Canon BJC-6000"
#: src/main/xmli18n-tmp.h:164
msgid "Canon BJC-6100"
-msgstr ""
+msgstr "Canon BJC-6100"
#: src/main/xmli18n-tmp.h:165
msgid "Canon BJC-6200"
-msgstr ""
+msgstr "Canon BJC-6200"
#: src/main/xmli18n-tmp.h:166
msgid "Canon BJC-6500"
-msgstr ""
+msgstr "Canon BJC-6500"
#: src/main/xmli18n-tmp.h:167
msgid "Canon BJC-7000"
-msgstr ""
+msgstr "Canon BJC-7000"
#: src/main/xmli18n-tmp.h:168
msgid "Canon BJC-7100"
-msgstr ""
+msgstr "Canon BJC-7100"
#: src/main/xmli18n-tmp.h:169
msgid "Canon BJC-8200"
-msgstr ""
+msgstr "Canon BJC-8200"
#: src/main/xmli18n-tmp.h:170
msgid "Canon S100"
-msgstr ""
+msgstr "Canon S100"
#: src/main/xmli18n-tmp.h:171
msgid "Canon S200"
-msgstr ""
+msgstr "Canon S200"
#: src/main/xmli18n-tmp.h:172
msgid "Canon S300"
-msgstr ""
+msgstr "Canon S300"
#: src/main/xmli18n-tmp.h:173
msgid "Canon S400"
-msgstr ""
+msgstr "Canon S400"
#: src/main/xmli18n-tmp.h:174
msgid "Canon S450"
-msgstr ""
+msgstr "Canon S450"
#: src/main/xmli18n-tmp.h:175
msgid "Canon S500"
-msgstr ""
+msgstr "Canon S500"
#: src/main/xmli18n-tmp.h:176
msgid "Canon S600"
-msgstr ""
+msgstr "Canon S600"
#: src/main/xmli18n-tmp.h:177
msgid "Canon S630"
-msgstr ""
+msgstr "Canon S630"
#: src/main/xmli18n-tmp.h:178
msgid "Canon S800"
-msgstr ""
+msgstr "Canon S800"
#: src/main/xmli18n-tmp.h:179
msgid "Canon S4500"
-msgstr ""
+msgstr "Canon S4500"
#: src/main/xmli18n-tmp.h:180
msgid "Canon iP4000"
-msgstr ""
+msgstr "Canon iP4000"
#: src/main/xmli18n-tmp.h:181
-#, fuzzy
msgid "Epson Stylus C20"
-msgstr "Stylus C20ux"
+msgstr "Epson Stylus C20"
#: src/main/xmli18n-tmp.h:182
-#, fuzzy
msgid "Epson Stylus C20SX"
-msgstr "Stylus C20ux"
+msgstr "Epson Stylus C20SX"
#: src/main/xmli18n-tmp.h:183
-#, fuzzy
msgid "Epson Stylus C20UX"
-msgstr "Stylus C20ux"
+msgstr "Epson Stylus C20UX"
#: src/main/xmli18n-tmp.h:184
-#, fuzzy
msgid "Epson Stylus C40"
-msgstr "Stylus C40ux"
+msgstr "Epson Stylus C40"
#: src/main/xmli18n-tmp.h:185
-#, fuzzy
msgid "Epson Stylus C40SX"
-msgstr "Stylus C40ux"
+msgstr "Epson Stylus C40SX"
#: src/main/xmli18n-tmp.h:186
-#, fuzzy
msgid "Epson Stylus C40UX"
-msgstr "Stylus C40ux"
+msgstr "Epson Stylus C40UX"
#: src/main/xmli18n-tmp.h:187
-#, fuzzy
msgid "Epson Stylus C41"
-msgstr "Stylus C41ux"
+msgstr "Epson Stylus C41"
#: src/main/xmli18n-tmp.h:188
-#, fuzzy
msgid "Epson Stylus C41SX"
-msgstr "Stylus C41ux"
+msgstr "Epson Stylus C41SX"
#: src/main/xmli18n-tmp.h:189
-#, fuzzy
msgid "Epson Stylus C41UX"
-msgstr "Stylus C41ux"
+msgstr "Epson Stylus C41UX"
#: src/main/xmli18n-tmp.h:190
-#, fuzzy
msgid "Epson Stylus C42"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C42"
#: src/main/xmli18n-tmp.h:191
-#, fuzzy
msgid "Epson Stylus C42SX"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C42SX"
#: src/main/xmli18n-tmp.h:192
-#, fuzzy
msgid "Epson Stylus C42UX"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C42UX"
#: src/main/xmli18n-tmp.h:193
-#, fuzzy
msgid "Epson Stylus C43"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C43"
#: src/main/xmli18n-tmp.h:194
-#, fuzzy
msgid "Epson Stylus C43SX"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C43SX"
#: src/main/xmli18n-tmp.h:195
-#, fuzzy
msgid "Epson Stylus C43UX"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C43UX"
#: src/main/xmli18n-tmp.h:196
-#, fuzzy
msgid "Epson Stylus C44"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C44"
#: src/main/xmli18n-tmp.h:197
-#, fuzzy
msgid "Epson Stylus C44SX"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C44SX"
#: src/main/xmli18n-tmp.h:198
-#, fuzzy
msgid "Epson Stylus C44UX"
-msgstr "Stylus C42ux"
+msgstr "Epson Stylus C44UX"
#: src/main/xmli18n-tmp.h:199
-#, fuzzy
msgid "Epson Stylus C45"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C45"
#: src/main/xmli18n-tmp.h:200
-#, fuzzy
msgid "Epson Stylus C46"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C46"
#: src/main/xmli18n-tmp.h:201
-#, fuzzy
msgid "Epson Stylus C48"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C48"
#: src/main/xmli18n-tmp.h:202
-#, fuzzy
msgid "Epson Stylus C50"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C50"
#: src/main/xmli18n-tmp.h:203
-#, fuzzy
msgid "Epson Stylus C60"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C60"
#: src/main/xmli18n-tmp.h:204
-#, fuzzy
msgid "Epson Stylus C61"
-msgstr "Stylus C61"
+msgstr "Epson Stylus C61"
#: src/main/xmli18n-tmp.h:205
-#, fuzzy
msgid "Epson Stylus C62"
-msgstr "Stylus C62"
+msgstr "Epson Stylus C62"
#: src/main/xmli18n-tmp.h:206
-#, fuzzy
msgid "Epson Stylus C63"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C63"
#: src/main/xmli18n-tmp.h:207
-#, fuzzy
msgid "Epson Stylus C64"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C64"
#: src/main/xmli18n-tmp.h:208
-#, fuzzy
msgid "Epson Stylus C65"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C65"
#: src/main/xmli18n-tmp.h:209
-#, fuzzy
msgid "Epson Stylus C66"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C66"
#: src/main/xmli18n-tmp.h:210
-#, fuzzy
msgid "Epson Stylus C68"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C68"
#: src/main/xmli18n-tmp.h:211
-#, fuzzy
msgid "Epson Stylus C70"
-msgstr "Stylus C70"
+msgstr "Epson Stylus C70"
#: src/main/xmli18n-tmp.h:212
-#, fuzzy
msgid "Epson Stylus C80"
-msgstr "Stylus C80"
+msgstr "Epson Stylus C80"
#: src/main/xmli18n-tmp.h:213
-#, fuzzy
msgid "Epson Stylus C82"
-msgstr "Stylus C82"
+msgstr "Epson Stylus C82"
#: src/main/xmli18n-tmp.h:214
-#, fuzzy
msgid "Epson Stylus C83"
-msgstr "Stylus C80"
+msgstr "Epson Stylus C83"
#: src/main/xmli18n-tmp.h:215
-#, fuzzy
msgid "Epson Stylus C84"
-msgstr "Stylus C80"
+msgstr "Epson Stylus C84"
#: src/main/xmli18n-tmp.h:216
-#, fuzzy
msgid "Epson Stylus C85"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C85"
#: src/main/xmli18n-tmp.h:217
-#, fuzzy
msgid "Epson Stylus C86"
-msgstr "Stylus C60"
+msgstr "Epson Stylus C86"
#: src/main/xmli18n-tmp.h:218
-#, fuzzy
msgid "Epson Stylus C88"
-msgstr "Stylus C80"
+msgstr "Epson Stylus C88"
#: src/main/xmli18n-tmp.h:219
-#, fuzzy
msgid "Epson Stylus Color"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color"
#: src/main/xmli18n-tmp.h:220
-#, fuzzy
msgid "Epson Stylus Color I"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color I"
#: src/main/xmli18n-tmp.h:221
-#, fuzzy
msgid "Epson Stylus Color II"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color II"
#: src/main/xmli18n-tmp.h:222
-#, fuzzy
msgid "Epson Stylus Color IIs"
-msgstr "Stylus Color"
+msgstr "Epson Stylus Color IIs"
#: src/main/xmli18n-tmp.h:223
-#, fuzzy
msgid "Epson Stylus Color PRO"
-msgstr "Stylus Color Pro"
+msgstr "Epson Stylus Color PRO"
#: src/main/xmli18n-tmp.h:224
-#, fuzzy
msgid "Epson Stylus Pro XL"
-msgstr "Stylus Color Pro XL"
+msgstr "Epson Stylus Pro XL"
#: src/main/xmli18n-tmp.h:225
-#, fuzzy
msgid "Epson Stylus Color 400"
-msgstr "Stylus Color 400"
+msgstr "Epson Stylus Color 400"
#: src/main/xmli18n-tmp.h:226
-#, fuzzy
msgid "Epson Stylus Color 440"
-msgstr "Stylus Color 440"
+msgstr "Epson Stylus Color 440"
#: src/main/xmli18n-tmp.h:227
-#, fuzzy
msgid "Epson Stylus Color 460"
-msgstr "Stylus Color 460"
+msgstr "Epson Stylus Color 460"
#: src/main/xmli18n-tmp.h:228
-#, fuzzy
msgid "Epson Stylus Color 480"
-msgstr "Stylus Color 480"
+msgstr "Epson Stylus Color 480"
#: src/main/xmli18n-tmp.h:229
-#, fuzzy
msgid "Epson Stylus Color 500"
-msgstr "Stylus Color 500"
+msgstr "Epson Stylus Color 500"
#: src/main/xmli18n-tmp.h:230
-#, fuzzy
msgid "Epson Stylus Color 580"
-msgstr "Stylus Color 580"
+msgstr "Epson Stylus Color 580"
#: src/main/xmli18n-tmp.h:231
-#, fuzzy
msgid "Epson Stylus Color 600"
-msgstr "Stylus Color 600"
+msgstr "Epson Stylus Color 600"
#: src/main/xmli18n-tmp.h:232
-#, fuzzy
msgid "Epson Stylus Color 640"
-msgstr "Stylus Color 640"
+msgstr "Epson Stylus Color 640"
#: src/main/xmli18n-tmp.h:233
-#, fuzzy
msgid "Epson Stylus Color 660"
-msgstr "Stylus Color 660"
+msgstr "Epson Stylus Color 660"
#: src/main/xmli18n-tmp.h:234
-#, fuzzy
msgid "Epson Stylus Color 670"
-msgstr "Stylus Color 670"
+msgstr "Epson Stylus Color 670"
#: src/main/xmli18n-tmp.h:235
-#, fuzzy
msgid "Epson Stylus Color 680"
-msgstr "Stylus Color 680"
+msgstr "Epson Stylus Color 680"
#: src/main/xmli18n-tmp.h:236
-#, fuzzy
msgid "Epson Stylus Color 740"
-msgstr "Stylus Color 740"
+msgstr "Epson Stylus Color 740"
#: src/main/xmli18n-tmp.h:237
-#, fuzzy
msgid "Epson Stylus Color 760"
-msgstr "Stylus Color 760"
+msgstr "Epson Stylus Color 760"
#: src/main/xmli18n-tmp.h:238
-#, fuzzy
msgid "Epson Stylus Color 777"
-msgstr "Stylus Color 777"
+msgstr "Epson Stylus Color 777"
#: src/main/xmli18n-tmp.h:239
-#, fuzzy
msgid "Epson Stylus Color 800"
-msgstr "Stylus Color 800"
+msgstr "Epson Stylus Color 800"
#: src/main/xmli18n-tmp.h:240
-#, fuzzy
msgid "Epson Stylus Color 850"
-msgstr "Stylus Color 850"
+msgstr "Epson Stylus Color 850"
#: src/main/xmli18n-tmp.h:241
-#, fuzzy
msgid "Epson Stylus Color 860"
-msgstr "Stylus Color 860"
+msgstr "Epson Stylus Color 860"
#: src/main/xmli18n-tmp.h:242
-#, fuzzy
msgid "Epson Stylus Color 880"
-msgstr "Stylus Color 880"
+msgstr "Epson Stylus Color 880"
#: src/main/xmli18n-tmp.h:243
-#, fuzzy
msgid "Epson Stylus Color 8 3"
-msgstr "Stylus Color 83"
+msgstr "Epson Stylus Color 8 3"
#: src/main/xmli18n-tmp.h:244
-#, fuzzy
msgid "Epson Stylus Color 900"
-msgstr "Stylus Color 900"
+msgstr "Epson Stylus Color 900"
#: src/main/xmli18n-tmp.h:245
-#, fuzzy
msgid "Epson Stylus Color 980"
-msgstr "Stylus Color 980"
+msgstr "Epson Stylus Color 980"
#: src/main/xmli18n-tmp.h:246
-#, fuzzy
msgid "Epson Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
#: src/main/xmli18n-tmp.h:247
-#, fuzzy
msgid "Epson Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
#: src/main/xmli18n-tmp.h:248
-#, fuzzy
msgid "Epson Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
#: src/main/xmli18n-tmp.h:249
-#, fuzzy
msgid "Epson Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
#: src/main/xmli18n-tmp.h:250
-#, fuzzy
msgid "Epson Stylus Photo"
-msgstr "Stylus Photo"
+msgstr "Epson Stylus Photo"
#: src/main/xmli18n-tmp.h:251
-#, fuzzy
msgid "Epson Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
#: src/main/xmli18n-tmp.h:252
-#, fuzzy
msgid "Epson Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
#: src/main/xmli18n-tmp.h:253
-#, fuzzy
msgid "Epson Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgstr "Epson Stylus Photo EX3"
#: src/main/xmli18n-tmp.h:254
-#, fuzzy
msgid "Epson Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
#: src/main/xmli18n-tmp.h:255
-#, fuzzy
msgid "Epson Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
#: src/main/xmli18n-tmp.h:256
-#, fuzzy
msgid "Epson Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
#: src/main/xmli18n-tmp.h:257
-#, fuzzy
msgid "Epson Stylus Photo 785"
-msgstr "Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
#: src/main/xmli18n-tmp.h:258
-#, fuzzy
msgid "Epson Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
#: src/main/xmli18n-tmp.h:259
-#, fuzzy
msgid "Epson Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
#: src/main/xmli18n-tmp.h:260
-#, fuzzy
msgid "Epson Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
#: src/main/xmli18n-tmp.h:261
-#, fuzzy
msgid "Epson Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgstr "Epson Stylus Photo 825"
#: src/main/xmli18n-tmp.h:262
-#, fuzzy
msgid "Epson Stylus Photo 830"
-msgstr "Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
#: src/main/xmli18n-tmp.h:263
-#, fuzzy
msgid "Epson Stylus Photo 830U"
-msgstr "Stylus Photo 830"
+msgstr "Epson Stylus Photo 830U"
#: src/main/xmli18n-tmp.h:264
-#, fuzzy
msgid "Epson Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
#: src/main/xmli18n-tmp.h:265
-#, fuzzy
msgid "Epson Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
#: src/main/xmli18n-tmp.h:266
-#, fuzzy
msgid "Epson Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
#: src/main/xmli18n-tmp.h:267
-#, fuzzy
msgid "Epson Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
#: src/main/xmli18n-tmp.h:268
-#, fuzzy
msgid "Epson Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo 900"
#: src/main/xmli18n-tmp.h:269
-#, fuzzy
msgid "Epson Stylus Photo 915"
-msgstr "Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
#: src/main/xmli18n-tmp.h:270
-#, fuzzy
msgid "Epson Stylus Photo 925"
-msgstr "Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
#: src/main/xmli18n-tmp.h:271
-#, fuzzy
msgid "Epson Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgstr "Epson Stylus Photo 935"
#: src/main/xmli18n-tmp.h:272
-#, fuzzy
msgid "Epson Stylus Photo 950"
-msgstr "Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
#: src/main/xmli18n-tmp.h:273
-#, fuzzy
msgid "Epson Stylus Photo 960"
-msgstr "Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
#: src/main/xmli18n-tmp.h:274
-#, fuzzy
msgid "Epson Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
#: src/main/xmli18n-tmp.h:275
-#, fuzzy
msgid "Epson Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
#: src/main/xmli18n-tmp.h:276
-#, fuzzy
msgid "Epson Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
#: src/main/xmli18n-tmp.h:277
-#, fuzzy
msgid "Epson Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
#: src/main/xmli18n-tmp.h:278
-#, fuzzy
msgid "Epson Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
#: src/main/xmli18n-tmp.h:279
-#, fuzzy
msgid "Epson Stylus Photo 2100"
-msgstr "Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
#: src/main/xmli18n-tmp.h:280
-#, fuzzy
msgid "Epson Stylus Photo 2200"
-msgstr "Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
#: src/main/xmli18n-tmp.h:281
-#, fuzzy
msgid "Epson Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo R200"
#: src/main/xmli18n-tmp.h:282
-#, fuzzy
msgid "Epson Stylus Photo R210"
-msgstr "Stylus Photo 2100"
+msgstr "Epson Stylus Photo R210"
#: src/main/xmli18n-tmp.h:283
-#, fuzzy
msgid "Epson Stylus Photo R220"
-msgstr "Stylus Photo 2200"
+msgstr "Epson Stylus Photo R220"
#: src/main/xmli18n-tmp.h:284
-#, fuzzy
msgid "Epson Stylus Photo R300"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo R300"
#: src/main/xmli18n-tmp.h:285
-#, fuzzy
msgid "Epson Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo R310"
#: src/main/xmli18n-tmp.h:286
-#, fuzzy
msgid "Epson Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo R320"
#: src/main/xmli18n-tmp.h:287
-#, fuzzy
msgid "Epson Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo R340"
#: src/main/xmli18n-tmp.h:288
-#, fuzzy
msgid "Epson Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX400"
#: src/main/xmli18n-tmp.h:289
-#, fuzzy
msgid "Epson Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo RX420"
#: src/main/xmli18n-tmp.h:290
-#, fuzzy
msgid "Epson Stylus Photo RX425"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo RX425"
#: src/main/xmli18n-tmp.h:291
-#, fuzzy
msgid "Epson Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX430"
#: src/main/xmli18n-tmp.h:292
-#, fuzzy
msgid "Epson Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX500"
#: src/main/xmli18n-tmp.h:293
-#, fuzzy
msgid "Epson Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX510"
#: src/main/xmli18n-tmp.h:294
-#, fuzzy
msgid "Epson Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX600"
#: src/main/xmli18n-tmp.h:295
-#, fuzzy
msgid "Epson Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX620"
#: src/main/xmli18n-tmp.h:296
-#, fuzzy
msgid "Epson Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX630"
#: src/main/xmli18n-tmp.h:297
-#, fuzzy
msgid "Epson Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo RX700"
#: src/main/xmli18n-tmp.h:298
-#, fuzzy
msgid "Epson Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo R800"
#: src/main/xmli18n-tmp.h:299
-#, fuzzy
msgid "Epson Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgstr "Epson Stylus Photo R1800"
#: src/main/xmli18n-tmp.h:300
-#, fuzzy
msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgstr "Epson Stylus Photo R2400"
#: src/main/xmli18n-tmp.h:301
-#, fuzzy
msgid "Epson Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
#: src/main/xmli18n-tmp.h:302
-#, fuzzy
msgid "Epson Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
#: src/main/xmli18n-tmp.h:303
-#, fuzzy
msgid "Epson Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
#: src/main/xmli18n-tmp.h:304
-#, fuzzy
msgid "Epson Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
#: src/main/xmli18n-tmp.h:305
-#, fuzzy
msgid "Epson Stylus Pro 7600"
-msgstr "Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
#: src/main/xmli18n-tmp.h:306
-#, fuzzy
msgid "Epson Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
#: src/main/xmli18n-tmp.h:307
-#, fuzzy
msgid "Epson Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
#: src/main/xmli18n-tmp.h:308
-#, fuzzy
msgid "Epson Stylus Pro 9600"
-msgstr "Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
#: src/main/xmli18n-tmp.h:309
-#, fuzzy
msgid "Epson Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
#: src/main/xmli18n-tmp.h:310
-#, fuzzy
msgid "Epson Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
#: src/main/xmli18n-tmp.h:311
-#, fuzzy
msgid "Epson Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
#: src/main/xmli18n-tmp.h:312
-#, fuzzy
msgid "Epson Stylus CX1500"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX1500"
#: src/main/xmli18n-tmp.h:313
-#, fuzzy
msgid "Epson Stylus CX3100"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3100"
#: src/main/xmli18n-tmp.h:314
-#, fuzzy
msgid "Epson Stylus CX3200"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3200"
#: src/main/xmli18n-tmp.h:315
-#, fuzzy
msgid "Epson Stylus CX3500"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3500"
#: src/main/xmli18n-tmp.h:316
-#, fuzzy
msgid "Epson Stylus CX3600"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3600"
#: src/main/xmli18n-tmp.h:317
-#, fuzzy
msgid "Epson Stylus CX3650"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3650"
#: src/main/xmli18n-tmp.h:318
-#, fuzzy
msgid "Epson Stylus CX3700"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3700"
#: src/main/xmli18n-tmp.h:319
-#, fuzzy
msgid "Epson Stylus CX3800"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3800"
#: src/main/xmli18n-tmp.h:320
-#, fuzzy
msgid "Epson Stylus CX3805"
-msgstr "Stylus C60"
+msgstr "Epson Stylus CX3805"
#: src/main/xmli18n-tmp.h:321
-#, fuzzy
msgid "Epson Stylus CX3810"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX3810"
#: src/main/xmli18n-tmp.h:322
-#, fuzzy
msgid "Epson Stylus CX4100"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX4100"
#: src/main/xmli18n-tmp.h:323
-#, fuzzy
msgid "Epson Stylus CX4200"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX4200"
#: src/main/xmli18n-tmp.h:324
-#, fuzzy
msgid "Epson Stylus CX4500"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX4500"
#: src/main/xmli18n-tmp.h:325
-#, fuzzy
msgid "Epson Stylus CX4600"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX4600"
#: src/main/xmli18n-tmp.h:326
-#, fuzzy
msgid "Epson Stylus CX4700"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX4700"
#: src/main/xmli18n-tmp.h:327
-#, fuzzy
msgid "Epson Stylus CX4800"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX4800"
#: src/main/xmli18n-tmp.h:328
-#, fuzzy
msgid "Epson Stylus CX5100"
-msgstr "Stylus C60"
+msgstr "Epson Stylus CX5100"
#: src/main/xmli18n-tmp.h:329
-#, fuzzy
msgid "Epson Stylus CX5200"
-msgstr "Stylus C60"
+msgstr "Epson Stylus CX5200"
#: src/main/xmli18n-tmp.h:330
-#, fuzzy
msgid "Epson Stylus CX5300"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX5300"
#: src/main/xmli18n-tmp.h:331
-#, fuzzy
msgid "Epson Stylus CX5400"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX5400"
#: src/main/xmli18n-tmp.h:332
-#, fuzzy
msgid "Epson Stylus CX5700"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX5700"
#: src/main/xmli18n-tmp.h:333
-#, fuzzy
msgid "Epson Stylus CX5800"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX5800"
#: src/main/xmli18n-tmp.h:334
-#, fuzzy
msgid "Epson Stylus CX6300"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX6300"
#: src/main/xmli18n-tmp.h:335
-#, fuzzy
msgid "Epson Stylus CX6400"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX6400"
#: src/main/xmli18n-tmp.h:336
-#, fuzzy
msgid "Epson Stylus CX6500"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX6500"
#: src/main/xmli18n-tmp.h:337
-#, fuzzy
msgid "Epson Stylus CX6600"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX6600"
#: src/main/xmli18n-tmp.h:338
-#, fuzzy
msgid "Epson Stylus CX7700"
-msgstr "Stylus C70"
+msgstr "Epson Stylus CX7700"
#: src/main/xmli18n-tmp.h:339
-#, fuzzy
msgid "Epson Stylus CX7800"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX7800"
#: src/main/xmli18n-tmp.h:340
-#, fuzzy
msgid "Epson Stylus CX8300"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX8300"
#: src/main/xmli18n-tmp.h:341
-#, fuzzy
msgid "Epson Stylus CX8400"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus CX8400"
#: src/main/xmli18n-tmp.h:342
-#, fuzzy
msgid "Epson Stylus D68"
-msgstr "Stylus C60"
+msgstr "Epson Stylus D68"
#: src/main/xmli18n-tmp.h:343
-#, fuzzy
msgid "Epson Stylus D88"
-msgstr "Stylus C80"
+msgstr "Epson Stylus D88"
#: src/main/xmli18n-tmp.h:344
-#, fuzzy
msgid "Epson Stylus DX3800"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus DX3800"
#: src/main/xmli18n-tmp.h:345
-#, fuzzy
msgid "Epson Stylus DX3850"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus DX3850"
#: src/main/xmli18n-tmp.h:346
-#, fuzzy
msgid "Epson Stylus DX4200"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus DX4200"
#: src/main/xmli18n-tmp.h:347
-#, fuzzy
msgid "Epson Stylus DX4250"
-msgstr "Stylus C60"
+msgstr "Epson Stylus DX4250"
#: src/main/xmli18n-tmp.h:348
-#, fuzzy
msgid "Epson Stylus DX4800"
-msgstr "Stylus C20sx"
+msgstr "Epson Stylus DX4800"
#: src/main/xmli18n-tmp.h:349
msgid "Epson PictureMate"
-msgstr ""
+msgstr "Epson PictureMate"
#: src/main/xmli18n-tmp.h:350
msgid "Epson PictureMate Deluxe"
-msgstr ""
+msgstr "Epson PictureMate Deluxe"
#: src/main/xmli18n-tmp.h:351
msgid "Epson CL 700"
-msgstr ""
+msgstr "Epson CL 700"
#: src/main/xmli18n-tmp.h:352
msgid "Epson CL 750"
-msgstr ""
+msgstr "Epson CL 750"
#: src/main/xmli18n-tmp.h:353
msgid "Epson CL 760"
-msgstr ""
+msgstr "Epson CL 760"
#: src/main/xmli18n-tmp.h:354
msgid "Epson E 100"
-msgstr ""
+msgstr "Epson E 100"
#: src/main/xmli18n-tmp.h:355
msgid "Epson E 150"
-msgstr ""
+msgstr "Epson E 150"
#: src/main/xmli18n-tmp.h:356
msgid "Epson E 200"
-msgstr ""
+msgstr "Epson E 200"
#: src/main/xmli18n-tmp.h:357
msgid "Epson EM 900C"
-msgstr ""
+msgstr "Epson EM 900C"
#: src/main/xmli18n-tmp.h:358
msgid "Epson EM 930C"
-msgstr ""
+msgstr "Epson EM 930C"
#: src/main/xmli18n-tmp.h:359
msgid "Epson MC 2000"
-msgstr ""
+msgstr "Epson MC 2000"
#: src/main/xmli18n-tmp.h:360
msgid "Epson MC 5000"
-msgstr ""
+msgstr "Epson MC 5000"
#: src/main/xmli18n-tmp.h:361
msgid "Epson MC 7000"
-msgstr ""
+msgstr "Epson MC 7000"
#: src/main/xmli18n-tmp.h:362
msgid "Epson MC 9000"
-msgstr ""
+msgstr "Epson MC 9000"
#: src/main/xmli18n-tmp.h:363
msgid "Epson MC 10000"
-msgstr ""
+msgstr "Epson MC 10000"
#: src/main/xmli18n-tmp.h:364
msgid "Epson MJ 930C"
-msgstr ""
+msgstr "Epson MJ 930C"
#: src/main/xmli18n-tmp.h:365
msgid "Epson MJ 5100C"
-msgstr ""
+msgstr "Epson MJ 5100C"
#: src/main/xmli18n-tmp.h:366
msgid "Epson MJ 6000C"
-msgstr ""
+msgstr "Epson MJ 6000C"
#: src/main/xmli18n-tmp.h:367
msgid "Epson MJ 8000C"
-msgstr ""
+msgstr "Epson MJ 8000C"
#: src/main/xmli18n-tmp.h:368
msgid "Epson PM 700C"
-msgstr ""
+msgstr "Epson PM 700C"
#: src/main/xmli18n-tmp.h:369
msgid "Epson PM 730C"
-msgstr ""
+msgstr "Epson PM 730C"
#: src/main/xmli18n-tmp.h:370
msgid "Epson PM 740C"
-msgstr ""
+msgstr "Epson PM 740C"
#: src/main/xmli18n-tmp.h:371
msgid "Epson PM 750C"
-msgstr ""
+msgstr "Epson PM 750C"
#: src/main/xmli18n-tmp.h:372
msgid "Epson PM 760C"
-msgstr ""
+msgstr "Epson PM 760C"
#: src/main/xmli18n-tmp.h:373
msgid "Epson PM 770C"
-msgstr ""
+msgstr "Epson PM 770C"
#: src/main/xmli18n-tmp.h:374
msgid "Epson PM 780C"
-msgstr ""
+msgstr "Epson PM 780C"
#: src/main/xmli18n-tmp.h:375
msgid "Epson PM 790PT"
-msgstr ""
+msgstr "Epson PM 790PT"
#: src/main/xmli18n-tmp.h:376
msgid "Epson PM 800C"
-msgstr ""
+msgstr "Epson PM 800C"
#: src/main/xmli18n-tmp.h:377
msgid "Epson PM 850PT"
-msgstr ""
+msgstr "Epson PM 850PT"
#: src/main/xmli18n-tmp.h:378
msgid "Epson PM 870C"
-msgstr ""
+msgstr "Epson PM 870C"
#: src/main/xmli18n-tmp.h:379
msgid "Epson PM 880C"
-msgstr ""
+msgstr "Epson PM 880C"
#: src/main/xmli18n-tmp.h:380
msgid "Epson PM 930C"
-msgstr ""
+msgstr "Epson PM 930C"
#: src/main/xmli18n-tmp.h:381
msgid "Epson PM 940C"
-msgstr ""
+msgstr "Epson PM 940C"
#: src/main/xmli18n-tmp.h:382
msgid "Epson PM 950C"
-msgstr ""
+msgstr "Epson PM 950C"
#: src/main/xmli18n-tmp.h:383
msgid "Epson PM 970C"
-msgstr ""
+msgstr "Epson PM 970C"
#: src/main/xmli18n-tmp.h:384
msgid "Epson PM 980C"
-msgstr ""
+msgstr "Epson PM 980C"
#: src/main/xmli18n-tmp.h:385
msgid "Epson PM 2000C"
-msgstr ""
+msgstr "Epson PM 2000C"
#: src/main/xmli18n-tmp.h:386
msgid "Epson PM 2200C"
-msgstr ""
+msgstr "Epson PM 2200C"
#: src/main/xmli18n-tmp.h:387
msgid "Epson PM 3000C"
-msgstr ""
+msgstr "Epson PM 3000C"
#: src/main/xmli18n-tmp.h:388
msgid "Epson PM 3300C"
-msgstr ""
+msgstr "Epson PM 3300C"
#: src/main/xmli18n-tmp.h:389
msgid "Epson PM 3500C"
-msgstr ""
+msgstr "Epson PM 3500C"
#: src/main/xmli18n-tmp.h:390
msgid "Epson PM 3700C"
-msgstr ""
+msgstr "Epson PM 3700C"
#: src/main/xmli18n-tmp.h:391
msgid "Epson PM 4000PX"
-msgstr ""
+msgstr "Epson PM 4000PX"
#: src/main/xmli18n-tmp.h:392
msgid "Epson PM 5000C"
-msgstr ""
+msgstr "Epson PM 5000C"
#: src/main/xmli18n-tmp.h:393
msgid "Epson PM 7000C"
-msgstr ""
+msgstr "Epson PM 7000C"
#: src/main/xmli18n-tmp.h:394
msgid "Epson PM 9000C"
-msgstr ""
+msgstr "Epson PM 9000C"
#: src/main/xmli18n-tmp.h:395
-#, fuzzy
msgid "Epson PM 10000"
-msgstr "Stylus Pro 10000"
+msgstr "Epson PM 10000"
#: src/main/xmli18n-tmp.h:396
msgid "Epson PM A650"
-msgstr ""
+msgstr "Epson PM A650"
#: src/main/xmli18n-tmp.h:397
msgid "Epson PM A750"
-msgstr ""
+msgstr "Epson PM A750"
#: src/main/xmli18n-tmp.h:398
msgid "Epson PM A890"
-msgstr ""
+msgstr "Epson PM A890"
#: src/main/xmli18n-tmp.h:399
-#, fuzzy
msgid "Epson PM A900"
-msgstr "Stylus C60"
+msgstr "Epson PM A900"
#: src/main/xmli18n-tmp.h:400
msgid "Epson PM A950"
-msgstr ""
+msgstr "Epson PM A950"
#: src/main/xmli18n-tmp.h:401
msgid "Epson PM D600"
-msgstr ""
+msgstr "Epson PM D600"
#: src/main/xmli18n-tmp.h:402
-#, fuzzy
msgid "Epson PM D750"
-msgstr "Stylus C60"
+msgstr "Epson PM D750"
#: src/main/xmli18n-tmp.h:403
-#, fuzzy
msgid "Epson PM D770"
-msgstr "Stylus C60"
+msgstr "Epson PM D770"
#: src/main/xmli18n-tmp.h:404
msgid "Epson PM D800"
-msgstr ""
+msgstr "Epson PM D800"
#: src/main/xmli18n-tmp.h:405
-#, fuzzy
msgid "Epson PM D1000"
-msgstr "Stylus C60"
+msgstr "Epson PM D1000"
#: src/main/xmli18n-tmp.h:406
-#, fuzzy
msgid "Epson PM G700"
-msgstr "Stylus C60"
+msgstr "Epson PM G700"
#: src/main/xmli18n-tmp.h:407
-#, fuzzy
msgid "Epson PM G720"
-msgstr "Stylus C60"
+msgstr "Epson PM G720"
#: src/main/xmli18n-tmp.h:408
msgid "Epson PM G730"
-msgstr ""
+msgstr "Epson PM G730"
#: src/main/xmli18n-tmp.h:409
-#, fuzzy
msgid "Epson PM G800"
-msgstr "Stylus C60"
+msgstr "Epson PM G800"
#: src/main/xmli18n-tmp.h:410
-#, fuzzy
msgid "Epson PM G820"
-msgstr "Stylus C60"
+msgstr "Epson PM G820"
#: src/main/xmli18n-tmp.h:411
-#, fuzzy
msgid "Epson PX A650"
-msgstr "Stylus C60"
+msgstr "Epson PX A650"
#: src/main/xmli18n-tmp.h:412
-#, fuzzy
msgid "Epson PX G900"
-msgstr "Stylus C60"
+msgstr "Epson PX G900"
#: src/main/xmli18n-tmp.h:413
-#, fuzzy
msgid "Epson PX G920"
-msgstr "Stylus C60"
+msgstr "Epson PX G920"
#: src/main/xmli18n-tmp.h:414
-#, fuzzy
msgid "Epson PX G5000"
-msgstr "Stylus C60"
+msgstr "Epson PX G5000"
#: src/main/xmli18n-tmp.h:415
-#, fuzzy
msgid "Epson PX V500"
-msgstr "Stylus C60"
+msgstr "Epson PX V500"
#: src/main/xmli18n-tmp.h:416
-#, fuzzy
msgid "Epson PX V600"
-msgstr "Stylus C60"
+msgstr "Epson PX V600"
#: src/main/xmli18n-tmp.h:417
msgid "Epson PX V630"
-msgstr ""
+msgstr "Epson PX V630"
#: src/main/xmli18n-tmp.h:418
-#, fuzzy
msgid "Epson PX 5500"
-msgstr "Stylus C60"
+msgstr "Epson PX 5500"
#: src/main/xmli18n-tmp.h:419
msgid "Epson PX 7000"
-msgstr ""
+msgstr "Epson PX 7000"
#: src/main/xmli18n-tmp.h:420
msgid "Epson PX 9000"
-msgstr ""
+msgstr "Epson PX 9000"
#: src/main/xmli18n-tmp.h:421
msgid "Apollo P-2100"
-msgstr ""
+msgstr "Apollo P-2100"
#: src/main/xmli18n-tmp.h:422
msgid "Apollo P-2150"
-msgstr ""
+msgstr "Apollo P-2150"
#: src/main/xmli18n-tmp.h:423
msgid "Apollo P-2200"
-msgstr ""
+msgstr "Apollo P-2200"
#: src/main/xmli18n-tmp.h:424
msgid "Apollo P-2250"
-msgstr ""
+msgstr "Apollo P-2250"
#: src/main/xmli18n-tmp.h:425
msgid "Apollo P-2500"
-msgstr ""
+msgstr "Apollo P-2500"
#: src/main/xmli18n-tmp.h:426
msgid "Apollo P-2550"
-msgstr ""
+msgstr "Apollo P-2550"
#: src/main/xmli18n-tmp.h:427
msgid "Apollo P-2600"
-msgstr ""
+msgstr "Apollo P-2600"
#: src/main/xmli18n-tmp.h:428
msgid "Apollo P-2650"
-msgstr ""
+msgstr "Apollo P-2650"
#: src/main/xmli18n-tmp.h:429
msgid "Apple Color StyleWriter 4100"
-msgstr ""
+msgstr "Apple Color StyleWriter 4100"
#: src/main/xmli18n-tmp.h:430
msgid "Apple Color StyleWriter 4500"
-msgstr ""
+msgstr "Apple Color StyleWriter 4500"
#: src/main/xmli18n-tmp.h:431
msgid "Apple Color StyleWriter 6500"
-msgstr ""
+msgstr "Apple Color StyleWriter 6500"
#: src/main/xmli18n-tmp.h:432
msgid "Apple LaserWriter Select 360"
-msgstr ""
+msgstr "Apple LaserWriter Select 360"
#: src/main/xmli18n-tmp.h:433
msgid "Brother DCP-1200"
-msgstr ""
+msgstr "Brother DCP-1200"
#: src/main/xmli18n-tmp.h:434
msgid "Brother HL-4Ve"
-msgstr ""
+msgstr "Brother HL-4Ve"
#: src/main/xmli18n-tmp.h:435
msgid "Brother HL-10V"
-msgstr ""
+msgstr "Brother HL-10V"
#: src/main/xmli18n-tmp.h:436
msgid "Brother HL-10h"
-msgstr ""
+msgstr "Brother HL-10h"
#: src/main/xmli18n-tmp.h:437
msgid "Brother HL-630"
-msgstr ""
+msgstr "Brother HL-630"
#: src/main/xmli18n-tmp.h:438
msgid "Brother HL-660"
-msgstr ""
+msgstr "Brother HL-660"
#: src/main/xmli18n-tmp.h:439
msgid "Brother HL-760"
-msgstr ""
+msgstr "Brother HL-760"
#: src/main/xmli18n-tmp.h:440
msgid "Brother HL-960"
-msgstr ""
+msgstr "Brother HL-960"
#: src/main/xmli18n-tmp.h:441
msgid "Brother HL-1040"
-msgstr ""
+msgstr "Brother HL-1040"
#: src/main/xmli18n-tmp.h:442
msgid "Brother HL-1050"
-msgstr ""
+msgstr "Brother HL-1050"
#: src/main/xmli18n-tmp.h:443
msgid "Brother HL-1060"
-msgstr ""
+msgstr "Brother HL-1060"
#: src/main/xmli18n-tmp.h:444
msgid "Brother HL-1070"
-msgstr ""
+msgstr "Brother HL-1070"
#: src/main/xmli18n-tmp.h:445
msgid "Brother HL-1240"
-msgstr ""
+msgstr "Brother HL-1240"
#: src/main/xmli18n-tmp.h:446
msgid "Brother HL-1250"
-msgstr ""
+msgstr "Brother HL-1250"
#: src/main/xmli18n-tmp.h:447
msgid "Brother HL-1260"
-msgstr ""
+msgstr "Brother HL-1260"
#: src/main/xmli18n-tmp.h:448
msgid "Brother HL-1270N"
-msgstr ""
+msgstr "Brother HL-1270N"
#: src/main/xmli18n-tmp.h:449
msgid "Brother HL-1440"
-msgstr ""
+msgstr "Brother HL-1440"
#: src/main/xmli18n-tmp.h:450
msgid "Brother HL-1660e"
-msgstr ""
+msgstr "Brother HL-1660e"
#: src/main/xmli18n-tmp.h:451
msgid "Brother HL-2060"
-msgstr ""
+msgstr "Brother HL-2060"
#: src/main/xmli18n-tmp.h:452
msgid "Brother MFC-6550MC"
-msgstr ""
+msgstr "Brother MFC-6550MC"
#: src/main/xmli18n-tmp.h:453
msgid "Brother MFC-8300"
-msgstr ""
+msgstr "Brother MFC-8300"
#: src/main/xmli18n-tmp.h:454
msgid "Brother MFC-9500"
-msgstr ""
+msgstr "Brother MFC-9500"
#: src/main/xmli18n-tmp.h:455
msgid "Brother MFC-9600"
-msgstr ""
+msgstr "Brother MFC-9600"
#: src/main/xmli18n-tmp.h:456
msgid "Canon GP 335"
-msgstr ""
+msgstr "Canon GP 335"
#: src/main/xmli18n-tmp.h:457
msgid "Canon LBP-4sx"
-msgstr ""
+msgstr "Canon LBP-4sx"
#: src/main/xmli18n-tmp.h:458
msgid "Canon LBP-430"
-msgstr ""
+msgstr "Canon LBP-430"
#: src/main/xmli18n-tmp.h:459
msgid "Canon LBP-1000"
-msgstr ""
+msgstr "Canon LBP-1000"
#: src/main/xmli18n-tmp.h:460
msgid "Canon LBP-1260"
-msgstr ""
+msgstr "Canon LBP-1260"
#: src/main/xmli18n-tmp.h:461
msgid "Canon LBP-1760"
-msgstr ""
+msgstr "Canon LBP-1760"
#: src/main/xmli18n-tmp.h:462
msgid "Canon imageRunner 330s"
-msgstr ""
+msgstr "Canon imageRunner 330s"
#: src/main/xmli18n-tmp.h:463
msgid "Citizen ProJet II"
-msgstr ""
+msgstr "Citizen ProJet II"
#: src/main/xmli18n-tmp.h:464
msgid "DEC 1800"
-msgstr ""
+msgstr "DEC 1800"
#: src/main/xmli18n-tmp.h:465
msgid "DEC LN17"
-msgstr ""
+msgstr "DEC LN17"
#: src/main/xmli18n-tmp.h:466
msgid "Epson ActionLaser 1100"
-msgstr ""
+msgstr "Epson ActionLaser 1100"
#: src/main/xmli18n-tmp.h:467
msgid "Epson ActionLaser II"
-msgstr ""
+msgstr "Epson ActionLaser II"
#: src/main/xmli18n-tmp.h:468
msgid "Epson AcuLaser C2000"
-msgstr ""
+msgstr "Epson AcuLaser C2000"
#: src/main/xmli18n-tmp.h:469
msgid "Epson AcuLaser C2000PS"
-msgstr ""
+msgstr "Epson AcuLaser C2000PS"
#: src/main/xmli18n-tmp.h:470
msgid "Epson AcuLaser C8500"
-msgstr ""
+msgstr "Epson AcuLaser C8500"
#: src/main/xmli18n-tmp.h:471
msgid "Epson AcuLaser C8500PS"
-msgstr ""
+msgstr "Epson AcuLaser C8500PS"
#: src/main/xmli18n-tmp.h:472
msgid "Epson AcuLaser C8600"
-msgstr ""
+msgstr "Epson AcuLaser C8600"
#: src/main/xmli18n-tmp.h:473
msgid "Epson AcuLaser C8600PS"
-msgstr ""
+msgstr "Epson AcuLaser C8600PS"
#: src/main/xmli18n-tmp.h:474
msgid "Epson EPL-5200"
-msgstr ""
+msgstr "Epson EPL-5200"
#: src/main/xmli18n-tmp.h:475
msgid "Epson EPL-5200+"
-msgstr ""
+msgstr "Epson EPL-5200+"
#: src/main/xmli18n-tmp.h:476
msgid "Epson EPL-5700"
-msgstr ""
+msgstr "Epson EPL-5700"
#: src/main/xmli18n-tmp.h:477
msgid "Epson EPL-5700PS"
-msgstr ""
+msgstr "Epson EPL-5700PS"
#: src/main/xmli18n-tmp.h:478
msgid "Epson EPL-5800"
-msgstr ""
+msgstr "Epson EPL-5800"
#: src/main/xmli18n-tmp.h:479
msgid "Epson EPL-5800PS"
-msgstr ""
+msgstr "Epson EPL-5800PS"
#: src/main/xmli18n-tmp.h:480
msgid "Epson EPL-5900"
-msgstr ""
+msgstr "Epson EPL-5900"
#: src/main/xmli18n-tmp.h:481
msgid "Epson EPL-5900PS"
-msgstr ""
+msgstr "Epson EPL-5900PS"
#: src/main/xmli18n-tmp.h:482
msgid "Epson EPL-6100"
-msgstr ""
+msgstr "Epson EPL-6100"
#: src/main/xmli18n-tmp.h:483
msgid "Epson EPL-6100PS"
-msgstr ""
+msgstr "Epson EPL-6100PS"
#: src/main/xmli18n-tmp.h:484
msgid "Epson EPL-7100"
-msgstr ""
+msgstr "Epson EPL-7100"
#: src/main/xmli18n-tmp.h:485
msgid "Fujitsu PrintPartner 10V"
-msgstr ""
+msgstr "Fujitsu PrintPartner 10V"
#: src/main/xmli18n-tmp.h:486
msgid "Fujitsu PrintPartner 16DV"
-msgstr ""
+msgstr "Fujitsu PrintPartner 16DV"
#: src/main/xmli18n-tmp.h:487
msgid "Fujitsu PrintPartner 20W"
-msgstr ""
+msgstr "Fujitsu PrintPartner 20W"
#: src/main/xmli18n-tmp.h:488
msgid "Fujitsu PrintPartner 8000"
-msgstr ""
+msgstr "Fujitsu PrintPartner 8000"
#: src/main/xmli18n-tmp.h:489
-#, fuzzy
msgid "Generic PCL 4 Printer"
-msgstr "Ange ny skrivare"
+msgstr "Allmän PCL 4-skrivare"
#: src/main/xmli18n-tmp.h:490
-#, fuzzy
msgid "Generic PCL 5 Printer"
-msgstr "Ange ny skrivare"
+msgstr "Allmän PCL 5-skivare"
#: src/main/xmli18n-tmp.h:491
-#, fuzzy
msgid "Generic PCL 5c Printer"
-msgstr "Ange ny skrivare"
+msgstr "Allmän PCL 5c-skivare"
#: src/main/xmli18n-tmp.h:492
-#, fuzzy
msgid "Generic PCL 5e Printer"
-msgstr "Ange ny skrivare"
+msgstr "Allmän PCL 5e-skivare"
#: src/main/xmli18n-tmp.h:493
msgid "Generic PCL 6/PCL XL Printer"
-msgstr ""
+msgstr "Allmän PCL 6/PCL XL-skrivare"
#: src/main/xmli18n-tmp.h:494
msgid "HP Business Inkjet 2200"
-msgstr ""
+msgstr "HP Business Inkjet 2200"
#: src/main/xmli18n-tmp.h:495
msgid "HP Business Inkjet 2230"
-msgstr ""
+msgstr "HP Business Inkjet 2230"
#: src/main/xmli18n-tmp.h:496
msgid "HP Business Inkjet 2250"
-msgstr ""
+msgstr "HP Business Inkjet 2250"
#: src/main/xmli18n-tmp.h:497
msgid "HP Business Inkjet 2250TN"
-msgstr ""
+msgstr "HP Business Inkjet 2250TN"
#: src/main/xmli18n-tmp.h:498
msgid "HP Business Inkjet 2280"
-msgstr ""
+msgstr "HP Business Inkjet 2280"
#: src/main/xmli18n-tmp.h:499
msgid "HP Color Inkjet Printer CP1160"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1160"
#: src/main/xmli18n-tmp.h:500
msgid "HP Color Inkjet Printer CP1700"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1700"
#: src/main/xmli18n-tmp.h:501
msgid "HP Color LaserJet 2500"
-msgstr ""
+msgstr "HP Color LaserJet 2500"
#: src/main/xmli18n-tmp.h:502
msgid "HP Color LaserJet 4500"
-msgstr ""
+msgstr "HP Color LaserJet 4500"
#: src/main/xmli18n-tmp.h:503
msgid "HP Color LaserJet 4550"
-msgstr ""
+msgstr "HP Color LaserJet 4550"
#: src/main/xmli18n-tmp.h:504
msgid "HP Color LaserJet 4600"
-msgstr ""
+msgstr "HP Color LaserJet 4600"
#: src/main/xmli18n-tmp.h:505
msgid "HP Color LaserJet 5"
-msgstr ""
+msgstr "HP Color LaserJet 5"
#: src/main/xmli18n-tmp.h:506
msgid "HP Color LaserJet 5000"
-msgstr ""
+msgstr "HP Color LaserJet 5000"
#: src/main/xmli18n-tmp.h:507
msgid "HP Color LaserJet 5500"
-msgstr ""
+msgstr "HP Color LaserJet 5500"
#: src/main/xmli18n-tmp.h:508
msgid "HP Color LaserJet 8550GN"
-msgstr ""
+msgstr "HP Color LaserJet 8550GN"
#: src/main/xmli18n-tmp.h:509
msgid "HP DesignJet 230"
-msgstr ""
+msgstr "HP DesignJet 230"
#: src/main/xmli18n-tmp.h:510
msgid "HP DesignJet 250C"
-msgstr ""
+msgstr "HP DesignJet 250C"
#: src/main/xmli18n-tmp.h:511
msgid "HP DesignJet 430"
-msgstr ""
+msgstr "HP DesignJet 430"
#: src/main/xmli18n-tmp.h:512
msgid "HP DesignJet 450C"
-msgstr ""
+msgstr "HP DesignJet 450C"
#: src/main/xmli18n-tmp.h:513
msgid "HP DesignJet 455CA"
-msgstr ""
+msgstr "HP DesignJet 455CA"
#: src/main/xmli18n-tmp.h:514
msgid "HP DesignJet 488CA"
-msgstr ""
+msgstr "HP DesignJet 488CA"
#: src/main/xmli18n-tmp.h:515
msgid "HP DesignJet 700"
-msgstr ""
+msgstr "HP DesignJet 700"
#: src/main/xmli18n-tmp.h:516
msgid "HP DesignJet 750C Plus"
-msgstr ""
+msgstr "HP DesignJet 750C Plus"
#: src/main/xmli18n-tmp.h:517
msgid "HP DesignJet 750C"
-msgstr ""
+msgstr "HP DesignJet 750C"
#: src/main/xmli18n-tmp.h:518
msgid "HP DesignJet 2500CP"
-msgstr ""
+msgstr "HP DesignJet 2500CP"
#: src/main/xmli18n-tmp.h:519
msgid "HP DesignJet 3500CP"
-msgstr ""
+msgstr "HP DesignJet 3500CP"
#: src/main/xmli18n-tmp.h:520
msgid "HP DesignJet ColorPro CAD"
-msgstr ""
+msgstr "HP DesignJet ColorPro CAD"
#: src/main/xmli18n-tmp.h:521
msgid "HP DeskJet 400"
-msgstr ""
+msgstr "HP DeskJet 400"
#: src/main/xmli18n-tmp.h:522
msgid "HP DeskJet 420C"
-msgstr ""
+msgstr "HP DeskJet 420C"
#: src/main/xmli18n-tmp.h:523
msgid "HP DeskJet 450"
-msgstr ""
+msgstr "HP DeskJet 450"
#: src/main/xmli18n-tmp.h:524
msgid "HP DeskJet 500"
-msgstr ""
+msgstr "HP DeskJet 500"
#: src/main/xmli18n-tmp.h:525
msgid "HP DeskJet 500C"
-msgstr ""
+msgstr "HP DeskJet 500C"
#: src/main/xmli18n-tmp.h:526
msgid "HP DeskJet 505J Plus"
-msgstr ""
+msgstr "HP DeskJet 505J Plus"
#: src/main/xmli18n-tmp.h:527
msgid "HP DeskJet 510"
-msgstr ""
+msgstr "HP DeskJet 510"
#: src/main/xmli18n-tmp.h:528
msgid "HP DeskJet 520"
-msgstr ""
+msgstr "HP DeskJet 520"
#: src/main/xmli18n-tmp.h:529
msgid "HP DeskJet 540C"
-msgstr ""
+msgstr "HP DeskJet 540C"
#: src/main/xmli18n-tmp.h:530
msgid "HP DeskJet 550C"
-msgstr ""
+msgstr "HP DeskJet 550C"
#: src/main/xmli18n-tmp.h:531
msgid "HP DeskJet 5550"
-msgstr ""
+msgstr "HP DeskJet 5550"
#: src/main/xmli18n-tmp.h:532
msgid "HP DeskJet 5551"
-msgstr ""
+msgstr "HP DeskJet 5551"
#: src/main/xmli18n-tmp.h:533
msgid "HP DeskJet 560C"
-msgstr ""
+msgstr "HP DeskJet 560C"
#: src/main/xmli18n-tmp.h:534
msgid "HP DeskJet 600"
-msgstr ""
+msgstr "HP DeskJet 600"
#: src/main/xmli18n-tmp.h:535
msgid "HP DeskJet 600C"
-msgstr ""
+msgstr "HP DeskJet 600C"
#: src/main/xmli18n-tmp.h:536
msgid "HP DeskJet 610C"
-msgstr ""
+msgstr "HP DeskJet 610C"
#: src/main/xmli18n-tmp.h:537
msgid "HP DeskJet 610CL"
-msgstr ""
+msgstr "HP DeskJet 610CL"
#: src/main/xmli18n-tmp.h:538
msgid "HP DeskJet 6122"
-msgstr ""
+msgstr "HP DeskJet 6122"
#: src/main/xmli18n-tmp.h:539
msgid "HP DeskJet 6127"
-msgstr ""
+msgstr "HP DeskJet 6127"
#: src/main/xmli18n-tmp.h:540
msgid "HP DeskJet 612C"
-msgstr ""
+msgstr "HP DeskJet 612C"
#: src/main/xmli18n-tmp.h:541
msgid "HP DeskJet 640C"
-msgstr ""
+msgstr "HP DeskJet 640C"
#: src/main/xmli18n-tmp.h:542
msgid "HP DeskJet 648C"
-msgstr ""
+msgstr "HP DeskJet 648C"
#: src/main/xmli18n-tmp.h:543
msgid "HP DeskJet 660C"
-msgstr ""
+msgstr "HP DeskJet 660C"
#: src/main/xmli18n-tmp.h:544
msgid "HP DeskJet 670C"
-msgstr ""
+msgstr "HP DeskJet 670C"
#: src/main/xmli18n-tmp.h:545
msgid "HP DeskJet 670TV"
-msgstr ""
+msgstr "HP DeskJet 670TV"
#: src/main/xmli18n-tmp.h:546
msgid "HP DeskJet 672C"
-msgstr ""
+msgstr "HP DeskJet 672C"
#: src/main/xmli18n-tmp.h:547
msgid "HP DeskJet 680C"
-msgstr ""
+msgstr "HP DeskJet 680C"
#: src/main/xmli18n-tmp.h:548
msgid "HP DeskJet 682C"
-msgstr ""
+msgstr "HP DeskJet 682C"
#: src/main/xmli18n-tmp.h:549
msgid "HP DeskJet 690C"
-msgstr ""
+msgstr "HP DeskJet 690C"
#: src/main/xmli18n-tmp.h:550
msgid "HP DeskJet 692C"
-msgstr ""
+msgstr "HP DeskJet 692C"
#: src/main/xmli18n-tmp.h:551
msgid "HP DeskJet 693C"
-msgstr ""
+msgstr "HP DeskJet 693C"
#: src/main/xmli18n-tmp.h:552
msgid "HP DeskJet 694C"
-msgstr ""
+msgstr "HP DeskJet 694C"
#: src/main/xmli18n-tmp.h:553
msgid "HP DeskJet 695C"
-msgstr ""
+msgstr "HP DeskJet 695C"
#: src/main/xmli18n-tmp.h:554
msgid "HP DeskJet 697C"
-msgstr ""
+msgstr "HP DeskJet 697C"
#: src/main/xmli18n-tmp.h:555
msgid "HP DeskJet 810C"
-msgstr ""
+msgstr "HP DeskJet 810C"
#: src/main/xmli18n-tmp.h:556
msgid "HP DeskJet 812C"
-msgstr ""
+msgstr "HP DeskJet 812C"
#: src/main/xmli18n-tmp.h:557
msgid "HP DeskJet 815C"
-msgstr ""
+msgstr "HP DeskJet 815C"
#: src/main/xmli18n-tmp.h:558
msgid "HP DeskJet 816C"
-msgstr ""
+msgstr "HP DeskJet 816C"
#: src/main/xmli18n-tmp.h:559
msgid "HP DeskJet 825C"
-msgstr ""
+msgstr "HP DeskJet 825C"
#: src/main/xmli18n-tmp.h:560
msgid "HP DeskJet 830C"
-msgstr ""
+msgstr "HP DeskJet 830C"
#: src/main/xmli18n-tmp.h:561
msgid "HP DeskJet 832C"
-msgstr ""
+msgstr "HP DeskJet 832C"
#: src/main/xmli18n-tmp.h:562
msgid "HP DeskJet 840C"
-msgstr ""
+msgstr "HP DeskJet 840C"
#: src/main/xmli18n-tmp.h:563
msgid "HP DeskJet 841C"
-msgstr ""
+msgstr "HP DeskJet 841C"
#: src/main/xmli18n-tmp.h:564
msgid "HP DeskJet 842C"
-msgstr ""
+msgstr "HP DeskJet 842C"
#: src/main/xmli18n-tmp.h:565
msgid "HP DeskJet 843C"
-msgstr ""
+msgstr "HP DeskJet 843C"
#: src/main/xmli18n-tmp.h:566
msgid "HP DeskJet 845C"
-msgstr ""
+msgstr "HP DeskJet 845C"
#: src/main/xmli18n-tmp.h:567
msgid "HP DeskJet 850C"
-msgstr ""
+msgstr "HP DeskJet 850C"
#: src/main/xmli18n-tmp.h:568
msgid "HP DeskJet 855C"
-msgstr ""
+msgstr "HP DeskJet 855C"
#: src/main/xmli18n-tmp.h:569
msgid "HP DeskJet 870C"
-msgstr ""
+msgstr "HP DeskJet 870C"
#: src/main/xmli18n-tmp.h:570
msgid "HP DeskJet 880C"
-msgstr ""
+msgstr "HP DeskJet 880C"
#: src/main/xmli18n-tmp.h:571
msgid "HP DeskJet 882C"
-msgstr ""
+msgstr "HP DeskJet 882C"
#: src/main/xmli18n-tmp.h:572
msgid "HP DeskJet 890C"
-msgstr ""
+msgstr "HP DeskJet 890C"
#: src/main/xmli18n-tmp.h:573
msgid "HP DeskJet 895C"
-msgstr ""
+msgstr "HP DeskJet 895C"
#: src/main/xmli18n-tmp.h:574
msgid "HP DeskJet 916C"
-msgstr ""
+msgstr "HP DeskJet 916C"
#: src/main/xmli18n-tmp.h:575
msgid "HP DeskJet 920C"
-msgstr ""
+msgstr "HP DeskJet 920C"
#: src/main/xmli18n-tmp.h:576
msgid "HP DeskJet 9300"
-msgstr ""
+msgstr "HP DeskJet 9300"
#: src/main/xmli18n-tmp.h:577
msgid "HP DeskJet 930C"
-msgstr ""
+msgstr "HP DeskJet 930C"
#: src/main/xmli18n-tmp.h:578
msgid "HP DeskJet 932C"
-msgstr ""
+msgstr "HP DeskJet 932C"
#: src/main/xmli18n-tmp.h:579
msgid "HP DeskJet 933C"
-msgstr ""
+msgstr "HP DeskJet 933C"
#: src/main/xmli18n-tmp.h:580
msgid "HP DeskJet 934C"
-msgstr ""
+msgstr "HP DeskJet 934C"
#: src/main/xmli18n-tmp.h:581
msgid "HP DeskJet 935C"
-msgstr ""
+msgstr "HP DeskJet 935C"
#: src/main/xmli18n-tmp.h:582
msgid "HP DeskJet 940C"
-msgstr ""
+msgstr "HP DeskJet 940C"
#: src/main/xmli18n-tmp.h:583
msgid "HP DeskJet 948C"
-msgstr ""
+msgstr "HP DeskJet 948C"
#: src/main/xmli18n-tmp.h:584
msgid "HP DeskJet 950C"
-msgstr ""
+msgstr "HP DeskJet 950C"
#: src/main/xmli18n-tmp.h:585
msgid "HP DeskJet 952C"
-msgstr ""
+msgstr "HP DeskJet 952C"
#: src/main/xmli18n-tmp.h:586
msgid "HP DeskJet 955C"
-msgstr ""
+msgstr "HP DeskJet 955C"
#: src/main/xmli18n-tmp.h:587
msgid "HP DeskJet 957C"
-msgstr ""
+msgstr "HP DeskJet 957C"
#: src/main/xmli18n-tmp.h:588
msgid "HP DeskJet 959C"
-msgstr ""
+msgstr "HP DeskJet 959C"
#: src/main/xmli18n-tmp.h:589
msgid "HP DeskJet 960C"
-msgstr ""
+msgstr "HP DeskJet 960C"
#: src/main/xmli18n-tmp.h:590
msgid "HP DeskJet 970C"
-msgstr ""
+msgstr "HP DeskJet 970C"
#: src/main/xmli18n-tmp.h:591
msgid "HP DeskJet 975C"
-msgstr ""
+msgstr "HP DeskJet 975C"
#: src/main/xmli18n-tmp.h:592
msgid "HP DeskJet 980C"
-msgstr ""
+msgstr "HP DeskJet 980C"
#: src/main/xmli18n-tmp.h:593
msgid "HP DeskJet 990C"
-msgstr ""
+msgstr "HP DeskJet 990C"
#: src/main/xmli18n-tmp.h:594
msgid "HP DeskJet 995C"
-msgstr ""
+msgstr "HP DeskJet 995C"
#: src/main/xmli18n-tmp.h:595
msgid "HP DeskJet 1100C"
-msgstr ""
+msgstr "HP DeskJet 1100C"
#: src/main/xmli18n-tmp.h:596
msgid "HP DeskJet 1120C"
-msgstr ""
+msgstr "HP DeskJet 1120C"
#: src/main/xmli18n-tmp.h:597
msgid "HP DeskJet 1125C"
-msgstr ""
+msgstr "HP DeskJet 1125C"
#: src/main/xmli18n-tmp.h:598
msgid "HP DeskJet 1200C"
-msgstr ""
+msgstr "HP DeskJet 1200C"
#: src/main/xmli18n-tmp.h:599
msgid "HP DeskJet 1220C"
-msgstr ""
+msgstr "HP DeskJet 1220C"
#: src/main/xmli18n-tmp.h:600
msgid "HP DeskJet 1600C"
-msgstr ""
+msgstr "HP DeskJet 1600C"
#: src/main/xmli18n-tmp.h:601
msgid "HP DeskJet 1600CM"
-msgstr ""
+msgstr "HP DeskJet 1600CM"
#: src/main/xmli18n-tmp.h:602
msgid "HP DeskJet 2000"
-msgstr ""
+msgstr "HP DeskJet 2000"
#: src/main/xmli18n-tmp.h:603
msgid "HP DeskJet 2500"
-msgstr ""
+msgstr "HP DeskJet 2500"
#: src/main/xmli18n-tmp.h:604
msgid "HP DeskJet 2500CM"
-msgstr ""
+msgstr "HP DeskJet 2500CM"
#: src/main/xmli18n-tmp.h:605
msgid "HP DeskJet 340C"
-msgstr ""
+msgstr "HP DeskJet 340C"
#: src/main/xmli18n-tmp.h:606
msgid "HP DeskJet 3810"
-msgstr ""
+msgstr "HP DeskJet 3810"
#: src/main/xmli18n-tmp.h:607
msgid "HP DeskJet 3816"
-msgstr ""
+msgstr "HP DeskJet 3816"
#: src/main/xmli18n-tmp.h:608
msgid "HP DeskJet 3820"
-msgstr ""
+msgstr "HP DeskJet 3820"
#: src/main/xmli18n-tmp.h:609
msgid "HP DeskJet 3822"
-msgstr ""
+msgstr "HP DeskJet 3822"
#: src/main/xmli18n-tmp.h:610
msgid "HP LaserJet 2"
-msgstr ""
+msgstr "HP LaserJet 2"
#: src/main/xmli18n-tmp.h:611
msgid "HP LaserJet 2D"
-msgstr ""
+msgstr "HP LaserJet 2D"
#: src/main/xmli18n-tmp.h:612
msgid "HP LaserJet 2P Plus"
-msgstr ""
+msgstr "HP LaserJet 2P Plus"
#: src/main/xmli18n-tmp.h:613
msgid "HP LaserJet 2P"
-msgstr ""
+msgstr "HP LaserJet 2P"
#: src/main/xmli18n-tmp.h:614
msgid "HP LaserJet 3"
-msgstr ""
+msgstr "HP LaserJet 3"
#: src/main/xmli18n-tmp.h:615
msgid "HP LaserJet 3D"
-msgstr ""
+msgstr "HP LaserJet 3D"
#: src/main/xmli18n-tmp.h:616
msgid "HP LaserJet 3P w/ PCL5"
-msgstr ""
+msgstr "HP LaserJet 3P w/ PCL5"
#: src/main/xmli18n-tmp.h:617
msgid "HP LaserJet 3P w/PS"
-msgstr ""
+msgstr "HP LaserJet 3P w/PS"
#: src/main/xmli18n-tmp.h:618
msgid "HP LaserJet 4 Plus"
-msgstr ""
+msgstr "HP LaserJet 4 Plus"
#: src/main/xmli18n-tmp.h:619
msgid "HP LaserJet 4"
-msgstr ""
+msgstr "HP LaserJet 4"
#: src/main/xmli18n-tmp.h:620
msgid "HP LaserJet 4L"
-msgstr ""
+msgstr "HP LaserJet 4L"
#: src/main/xmli18n-tmp.h:621
msgid "HP LaserJet 4M"
-msgstr ""
+msgstr "HP LaserJet 4M"
#: src/main/xmli18n-tmp.h:622
msgid "HP LaserJet 4ML"
-msgstr ""
+msgstr "HP LaserJet 4ML"
#: src/main/xmli18n-tmp.h:623
msgid "HP LaserJet 4P"
-msgstr ""
+msgstr "HP LaserJet 4P"
#: src/main/xmli18n-tmp.h:624
msgid "HP LaserJet 4Si"
-msgstr ""
+msgstr "HP LaserJet 4Si"
#: src/main/xmli18n-tmp.h:625
msgid "HP LaserJet 4V"
-msgstr ""
+msgstr "HP LaserJet 4V"
#: src/main/xmli18n-tmp.h:626
msgid "HP LaserJet 5"
-msgstr ""
+msgstr "HP LaserJet 5"
#: src/main/xmli18n-tmp.h:627
msgid "HP LaserJet 5L"
-msgstr ""
+msgstr "HP LaserJet 5L"
#: src/main/xmli18n-tmp.h:628
msgid "HP LaserJet 5M"
-msgstr ""
+msgstr "HP LaserJet 5M"
#: src/main/xmli18n-tmp.h:629
msgid "HP LaserJet 5MP"
-msgstr ""
+msgstr "HP LaserJet 5MP"
#: src/main/xmli18n-tmp.h:630
msgid "HP LaserJet 5P"
-msgstr ""
+msgstr "HP LaserJet 5P"
#: src/main/xmli18n-tmp.h:631
msgid "HP LaserJet 5Si"
-msgstr ""
+msgstr "HP LaserJet 5Si"
#: src/main/xmli18n-tmp.h:632
msgid "HP LaserJet 6"
-msgstr ""
+msgstr "HP LaserJet 6"
#: src/main/xmli18n-tmp.h:633
msgid "HP LaserJet 6L"
-msgstr ""
+msgstr "HP LaserJet 6L"
#: src/main/xmli18n-tmp.h:634
msgid "HP LaserJet 6MP"
-msgstr ""
+msgstr "HP LaserJet 6MP"
#: src/main/xmli18n-tmp.h:635
msgid "HP LaserJet 6P"
-msgstr ""
+msgstr "HP LaserJet 6P"
#: src/main/xmli18n-tmp.h:636
msgid "HP LaserJet 1010"
-msgstr ""
+msgstr "HP LaserJet 1010"
#: src/main/xmli18n-tmp.h:637
msgid "HP LaserJet 1012"
-msgstr ""
+msgstr "HP LaserJet 1012"
#: src/main/xmli18n-tmp.h:638
msgid "HP LaserJet 1015"
-msgstr ""
+msgstr "HP LaserJet 1015"
#: src/main/xmli18n-tmp.h:639
msgid "HP LaserJet 1100"
-msgstr ""
+msgstr "HP LaserJet 1100"
#: src/main/xmli18n-tmp.h:640
msgid "HP LaserJet 1100A"
-msgstr ""
+msgstr "HP LaserJet 1100A"
#: src/main/xmli18n-tmp.h:641
msgid "HP LaserJet 1150"
-msgstr ""
+msgstr "HP LaserJet 1150"
#: src/main/xmli18n-tmp.h:642
msgid "HP LaserJet 1200"
-msgstr ""
+msgstr "HP LaserJet 1200"
#: src/main/xmli18n-tmp.h:643
msgid "HP LaserJet 1220"
-msgstr ""
+msgstr "HP LaserJet 1220"
#: src/main/xmli18n-tmp.h:644
msgid "HP LaserJet 1300"
-msgstr ""
+msgstr "HP LaserJet 1300"
#: src/main/xmli18n-tmp.h:645
msgid "HP LaserJet 2100"
-msgstr ""
+msgstr "HP LaserJet 2100"
#: src/main/xmli18n-tmp.h:646
msgid "HP LaserJet 2100M"
-msgstr ""
+msgstr "HP LaserJet 2100M"
#: src/main/xmli18n-tmp.h:647
msgid "HP LaserJet 2200"
-msgstr ""
+msgstr "HP LaserJet 2200"
#: src/main/xmli18n-tmp.h:648
msgid "HP LaserJet 2300"
-msgstr ""
+msgstr "HP LaserJet 2300"
#: src/main/xmli18n-tmp.h:649
msgid "HP LaserJet 3200"
-msgstr ""
+msgstr "HP LaserJet 3200"
#: src/main/xmli18n-tmp.h:650
msgid "HP LaserJet 3200m"
-msgstr ""
+msgstr "HP LaserJet 3200m"
#: src/main/xmli18n-tmp.h:651
msgid "HP LaserJet 3200se"
-msgstr ""
+msgstr "HP LaserJet 3200se"
#: src/main/xmli18n-tmp.h:652
msgid "HP LaserJet 3300 MFP"
-msgstr ""
+msgstr "HP LaserJet 3300 MFP"
#: src/main/xmli18n-tmp.h:653
msgid "HP LaserJet 3310 MFP"
-msgstr ""
+msgstr "HP LaserJet 3310 MFP"
#: src/main/xmli18n-tmp.h:654
msgid "HP LaserJet 3320 MFP"
-msgstr ""
+msgstr "HP LaserJet 3320 MFP"
#: src/main/xmli18n-tmp.h:655
msgid "HP LaserJet 3320N MFP"
-msgstr ""
+msgstr "HP LaserJet 3320N MFP"
#: src/main/xmli18n-tmp.h:656
msgid "HP LaserJet 3330 MFP"
-msgstr ""
+msgstr "HP LaserJet 3330 MFP"
#: src/main/xmli18n-tmp.h:657
msgid "HP LaserJet 4000"
-msgstr ""
+msgstr "HP LaserJet 4000"
#: src/main/xmli18n-tmp.h:658
msgid "HP LaserJet 4050"
-msgstr ""
+msgstr "HP LaserJet 4050"
#: src/main/xmli18n-tmp.h:659
msgid "HP LaserJet 4100"
-msgstr ""
+msgstr "HP LaserJet 4100"
#: src/main/xmli18n-tmp.h:660
msgid "HP LaserJet 4200"
-msgstr ""
+msgstr "HP LaserJet 4200"
#: src/main/xmli18n-tmp.h:661
msgid "HP LaserJet 4300"
-msgstr ""
+msgstr "HP LaserJet 4300"
#: src/main/xmli18n-tmp.h:662
msgid "HP LaserJet 5000"
-msgstr ""
+msgstr "HP LaserJet 5000"
#: src/main/xmli18n-tmp.h:663
msgid "HP LaserJet 5100"
-msgstr ""
+msgstr "HP LaserJet 5100"
#: src/main/xmli18n-tmp.h:664
msgid "HP LaserJet 8000"
-msgstr ""
+msgstr "HP LaserJet 8000"
#: src/main/xmli18n-tmp.h:665
msgid "HP LaserJet 8100"
-msgstr ""
+msgstr "HP LaserJet 8100"
#: src/main/xmli18n-tmp.h:666
msgid "HP LaserJet 8150"
-msgstr ""
+msgstr "HP LaserJet 8150"
#: src/main/xmli18n-tmp.h:667
msgid "HP LaserJet 9000"
-msgstr ""
+msgstr "HP LaserJet 9000"
#: src/main/xmli18n-tmp.h:668
msgid "HP Mopier 240"
-msgstr ""
+msgstr "HP Mopier 240"
#: src/main/xmli18n-tmp.h:669
msgid "HP Mopier 320"
-msgstr ""
+msgstr "HP Mopier 320"
#: src/main/xmli18n-tmp.h:670
msgid "HP OfficeJet 300"
-msgstr ""
+msgstr "HP OfficeJet 300"
#: src/main/xmli18n-tmp.h:671
msgid "HP OfficeJet 330"
-msgstr ""
+msgstr "HP OfficeJet 330"
#: src/main/xmli18n-tmp.h:672
msgid "HP OfficeJet 350"
-msgstr ""
+msgstr "HP OfficeJet 350"
#: src/main/xmli18n-tmp.h:673
msgid "HP OfficeJet 500"
-msgstr ""
+msgstr "HP OfficeJet 500"
#: src/main/xmli18n-tmp.h:674
msgid "HP OfficeJet 520"
-msgstr ""
+msgstr "HP OfficeJet 520"
#: src/main/xmli18n-tmp.h:675
msgid "HP OfficeJet 570"
-msgstr ""
+msgstr "HP OfficeJet 570"
#: src/main/xmli18n-tmp.h:676
msgid "HP OfficeJet 580"
-msgstr ""
+msgstr "HP OfficeJet 580"
#: src/main/xmli18n-tmp.h:677
msgid "HP OfficeJet 590"
-msgstr ""
+msgstr "HP OfficeJet 590"
#: src/main/xmli18n-tmp.h:678
msgid "HP OfficeJet 600"
-msgstr ""
+msgstr "HP OfficeJet 600"
#: src/main/xmli18n-tmp.h:679
msgid "HP OfficeJet 610"
-msgstr ""
+msgstr "HP OfficeJet 610"
#: src/main/xmli18n-tmp.h:680
msgid "HP OfficeJet 625"
-msgstr ""
+msgstr "HP OfficeJet 625"
#: src/main/xmli18n-tmp.h:681
msgid "HP OfficeJet 630"
-msgstr ""
+msgstr "HP OfficeJet 630"
#: src/main/xmli18n-tmp.h:682
msgid "HP OfficeJet 635"
-msgstr ""
+msgstr "HP OfficeJet 635"
#: src/main/xmli18n-tmp.h:683
msgid "HP OfficeJet 700"
-msgstr ""
+msgstr "HP OfficeJet 700"
#: src/main/xmli18n-tmp.h:684
msgid "HP OfficeJet 710"
-msgstr ""
+msgstr "HP OfficeJet 710"
#: src/main/xmli18n-tmp.h:685
msgid "HP OfficeJet 720"
-msgstr ""
+msgstr "HP OfficeJet 720"
#: src/main/xmli18n-tmp.h:686
msgid "HP OfficeJet 725"
-msgstr ""
+msgstr "HP OfficeJet 725"
#: src/main/xmli18n-tmp.h:687
msgid "HP OfficeJet 5105"
-msgstr ""
+msgstr "HP OfficeJet 5105"
#: src/main/xmli18n-tmp.h:688
msgid "HP OfficeJet 5110"
-msgstr ""
+msgstr "HP OfficeJet 5110"
#: src/main/xmli18n-tmp.h:689
msgid "HP OfficeJet 5110xi"
-msgstr ""
+msgstr "HP OfficeJet 5110xi"
#: src/main/xmli18n-tmp.h:690
msgid "HP OfficeJet 6105"
-msgstr ""
+msgstr "HP OfficeJet 6105"
#: src/main/xmli18n-tmp.h:691
msgid "HP OfficeJet 6110"
-msgstr ""
+msgstr "HP OfficeJet 6110"
#: src/main/xmli18n-tmp.h:692
msgid "HP OfficeJet 7110"
-msgstr ""
+msgstr "HP OfficeJet 7110"
#: src/main/xmli18n-tmp.h:693
msgid "HP OfficeJet 7130"
-msgstr ""
+msgstr "HP OfficeJet 7130"
#: src/main/xmli18n-tmp.h:694
msgid "HP OfficeJet 7140"
-msgstr ""
+msgstr "HP OfficeJet 7140"
#: src/main/xmli18n-tmp.h:695
msgid "HP OfficeJet D125"
-msgstr ""
+msgstr "HP OfficeJet D125"
#: src/main/xmli18n-tmp.h:696
msgid "HP OfficeJet D135"
-msgstr ""
+msgstr "HP OfficeJet D135"
#: src/main/xmli18n-tmp.h:697
msgid "HP OfficeJet D145"
-msgstr ""
+msgstr "HP OfficeJet D145"
#: src/main/xmli18n-tmp.h:698
msgid "HP OfficeJet D155"
-msgstr ""
+msgstr "HP OfficeJet D155"
#: src/main/xmli18n-tmp.h:699
msgid "HP OfficeJet G55"
-msgstr ""
+msgstr "HP OfficeJet G55"
#: src/main/xmli18n-tmp.h:700
msgid "HP OfficeJet G85"
-msgstr ""
+msgstr "HP OfficeJet G85"
#: src/main/xmli18n-tmp.h:701
msgid "HP OfficeJet G95"
-msgstr ""
+msgstr "HP OfficeJet G95"
#: src/main/xmli18n-tmp.h:702
msgid "HP OfficeJet K60"
-msgstr ""
+msgstr "HP OfficeJet K60"
#: src/main/xmli18n-tmp.h:703
msgid "HP OfficeJet K60xi"
-msgstr ""
+msgstr "HP OfficeJet K60xi"
#: src/main/xmli18n-tmp.h:704
msgid "HP OfficeJet K80"
-msgstr ""
+msgstr "HP OfficeJet K80"
#: src/main/xmli18n-tmp.h:705
msgid "HP OfficeJet K80xi"
-msgstr ""
+msgstr "HP OfficeJet K80xi"
#: src/main/xmli18n-tmp.h:706
msgid "HP OfficeJet LX"
-msgstr ""
+msgstr "HP OfficeJet LX"
#: src/main/xmli18n-tmp.h:707
msgid "HP OfficeJet Pro 1150C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1150C"
#: src/main/xmli18n-tmp.h:708
msgid "HP OfficeJet Pro 1170C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1170C"
#: src/main/xmli18n-tmp.h:709
msgid "HP OfficeJet Pro 1175C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1175C"
#: src/main/xmli18n-tmp.h:710
msgid "HP OfficeJet R40"
-msgstr ""
+msgstr "HP OfficeJet R40"
#: src/main/xmli18n-tmp.h:711
msgid "HP OfficeJet R45"
-msgstr ""
+msgstr "HP OfficeJet R45"
#: src/main/xmli18n-tmp.h:712
msgid "HP OfficeJet R60"
-msgstr ""
+msgstr "HP OfficeJet R60"
#: src/main/xmli18n-tmp.h:713
msgid "HP OfficeJet R65"
-msgstr ""
+msgstr "HP OfficeJet R65"
#: src/main/xmli18n-tmp.h:714
msgid "HP OfficeJet R80"
-msgstr ""
+msgstr "HP OfficeJet R80"
#: src/main/xmli18n-tmp.h:715
msgid "HP OfficeJet T45"
-msgstr ""
+msgstr "HP OfficeJet T45"
#: src/main/xmli18n-tmp.h:716
msgid "HP OfficeJet T65"
-msgstr ""
+msgstr "HP OfficeJet T65"
#: src/main/xmli18n-tmp.h:717
msgid "HP OfficeJet V40"
-msgstr ""
+msgstr "HP OfficeJet V40"
#: src/main/xmli18n-tmp.h:718
msgid "HP OfficeJet V40xi"
-msgstr ""
+msgstr "HP OfficeJet V40xi"
#: src/main/xmli18n-tmp.h:719
msgid "HP OfficeJet"
-msgstr ""
+msgstr "HP OfficeJet"
#: src/main/xmli18n-tmp.h:720
msgid "HP PSC 370"
-msgstr ""
+msgstr "HP PSC 370"
#: src/main/xmli18n-tmp.h:721
msgid "HP PSC 380"
-msgstr ""
+msgstr "HP PSC 380"
#: src/main/xmli18n-tmp.h:722
msgid "HP PSC 500"
-msgstr ""
+msgstr "HP PSC 500"
#: src/main/xmli18n-tmp.h:723
msgid "HP PSC 750"
-msgstr ""
+msgstr "HP PSC 750"
#: src/main/xmli18n-tmp.h:724
msgid "HP PSC 950"
-msgstr ""
+msgstr "HP PSC 950"
#: src/main/xmli18n-tmp.h:725
msgid "HP PSC 950xi"
-msgstr ""
+msgstr "HP PSC 950xi"
#: src/main/xmli18n-tmp.h:726
msgid "HP PSC 2110"
-msgstr ""
+msgstr "HP PSC 2110"
#: src/main/xmli18n-tmp.h:727
msgid "HP PSC 2150"
-msgstr ""
+msgstr "HP PSC 2150"
#: src/main/xmli18n-tmp.h:728
msgid "HP PSC 2210"
-msgstr ""
+msgstr "HP PSC 2210"
#: src/main/xmli18n-tmp.h:729
msgid "HP PhotoSmart 7150"
-msgstr ""
+msgstr "HP PhotoSmart 7150"
#: src/main/xmli18n-tmp.h:730
msgid "HP PhotoSmart 7345"
-msgstr ""
+msgstr "HP PhotoSmart 7345"
#: src/main/xmli18n-tmp.h:731
msgid "HP PhotoSmart 7350"
-msgstr ""
+msgstr "HP PhotoSmart 7350"
#: src/main/xmli18n-tmp.h:732
msgid "HP PhotoSmart 7550"
-msgstr ""
+msgstr "HP PhotoSmart 7550"
#: src/main/xmli18n-tmp.h:733
msgid "HP PhotoSmart P100"
-msgstr ""
+msgstr "HP PhotoSmart P100"
#: src/main/xmli18n-tmp.h:734
msgid "HP PhotoSmart P130"
-msgstr ""
+msgstr "HP PhotoSmart P130"
#: src/main/xmli18n-tmp.h:735
msgid "HP PhotoSmart P230"
-msgstr ""
+msgstr "HP PhotoSmart P230"
#: src/main/xmli18n-tmp.h:736
msgid "HP PhotoSmart P1000"
-msgstr ""
+msgstr "HP PhotoSmart P1000"
#: src/main/xmli18n-tmp.h:737
msgid "HP PhotoSmart P1100"
-msgstr ""
+msgstr "HP PhotoSmart P1100"
#: src/main/xmli18n-tmp.h:738
msgid "HP PhotoSmart P1115"
-msgstr ""
+msgstr "HP PhotoSmart P1115"
#: src/main/xmli18n-tmp.h:739
msgid "HP PhotoSmart P1215"
-msgstr ""
+msgstr "HP PhotoSmart P1215"
#: src/main/xmli18n-tmp.h:740
msgid "HP PhotoSmart P1218"
-msgstr ""
+msgstr "HP PhotoSmart P1218"
#: src/main/xmli18n-tmp.h:741
msgid "HP PhotoSmart P1315"
-msgstr ""
+msgstr "HP PhotoSmart P1315"
#: src/main/xmli18n-tmp.h:742
-#, fuzzy
msgid "HP e-printer e20"
-msgstr "Skrivarnamn:"
+msgstr "HP e-printer e20"
#: src/main/xmli18n-tmp.h:743
msgid "IBM 4019"
-msgstr ""
+msgstr "IBM 4019"
#: src/main/xmli18n-tmp.h:744
msgid "IBM 4029 030 LaserPrinter 10"
-msgstr ""
+msgstr "IBM 4029 030 LaserPrinter 10"
#: src/main/xmli18n-tmp.h:745
msgid "IBM 4312"
-msgstr ""
+msgstr "IBM 4312"
#: src/main/xmli18n-tmp.h:746
msgid "IBM Infoprint 12"
-msgstr ""
+msgstr "IBM Infoprint 12"
#: src/main/xmli18n-tmp.h:747
msgid "IBM Page Printer 3112"
-msgstr ""
+msgstr "IBM Page Printer 3112"
#: src/main/xmli18n-tmp.h:748
msgid "Infotec 4651 MF"
-msgstr ""
+msgstr "Infotec 4651 MF"
#: src/main/xmli18n-tmp.h:749
msgid "Kyocera F-1010"
-msgstr ""
+msgstr "Kyocera F-1010"
#: src/main/xmli18n-tmp.h:750
msgid "Kyocera FS-600 - KPDL-2"
-msgstr ""
+msgstr "Kyocera FS-600 - KPDL-2"
#: src/main/xmli18n-tmp.h:751
msgid "Kyocera FS-600"
-msgstr ""
+msgstr "Kyocera FS-600"
#: src/main/xmli18n-tmp.h:752
msgid "Kyocera FS-680"
-msgstr ""
+msgstr "Kyocera FS-680"
#: src/main/xmli18n-tmp.h:753
msgid "Kyocera FS-800"
-msgstr ""
+msgstr "Kyocera FS-800"
#: src/main/xmli18n-tmp.h:754
msgid "Kyocera FS-1000"
-msgstr ""
+msgstr "Kyocera FS-1000"
#: src/main/xmli18n-tmp.h:755
msgid "Kyocera FS-1000+"
-msgstr ""
+msgstr "Kyocera FS-1000+"
#: src/main/xmli18n-tmp.h:756
msgid "Kyocera FS-1010"
-msgstr ""
+msgstr "Kyocera FS-1010"
#: src/main/xmli18n-tmp.h:757
msgid "Kyocera FS-1050"
-msgstr ""
+msgstr "Kyocera FS-1050"
#: src/main/xmli18n-tmp.h:758
msgid "Kyocera FS-1200"
-msgstr ""
+msgstr "Kyocera FS-1200"
#: src/main/xmli18n-tmp.h:759
msgid "Kyocera FS-1600"
-msgstr ""
+msgstr "Kyocera FS-1600"
#: src/main/xmli18n-tmp.h:760
msgid "Kyocera FS-1600+"
-msgstr ""
+msgstr "Kyocera FS-1600+"
#: src/main/xmli18n-tmp.h:761
msgid "Kyocera FS-1700"
-msgstr ""
+msgstr "Kyocera FS-1700"
#: src/main/xmli18n-tmp.h:762
msgid "Kyocera FS-1700+"
-msgstr ""
+msgstr "Kyocera FS-1700+"
#: src/main/xmli18n-tmp.h:763
msgid "Kyocera FS-1750"
-msgstr ""
+msgstr "Kyocera FS-1750"
#: src/main/xmli18n-tmp.h:764
msgid "Kyocera FS-1800"
-msgstr ""
+msgstr "Kyocera FS-1800"
#: src/main/xmli18n-tmp.h:765
msgid "Kyocera FS-1800+"
-msgstr ""
+msgstr "Kyocera FS-1800+"
#: src/main/xmli18n-tmp.h:766
msgid "Kyocera FS-1900"
-msgstr ""
+msgstr "Kyocera FS-1900"
#: src/main/xmli18n-tmp.h:767
msgid "Kyocera FS-3500"
-msgstr ""
+msgstr "Kyocera FS-3500"
#: src/main/xmli18n-tmp.h:768
msgid "Kyocera FS-3600"
-msgstr ""
+msgstr "Kyocera FS-3600"
#: src/main/xmli18n-tmp.h:769
msgid "Kyocera FS-3600+"
-msgstr ""
+msgstr "Kyocera FS-3600+"
#: src/main/xmli18n-tmp.h:770
msgid "Kyocera FS-3700"
-msgstr ""
+msgstr "Kyocera FS-3700"
#: src/main/xmli18n-tmp.h:771
msgid "Kyocera FS-3700+"
-msgstr ""
+msgstr "Kyocera FS-3700+"
#: src/main/xmli18n-tmp.h:772
msgid "Kyocera FS-3750"
-msgstr ""
+msgstr "Kyocera FS-3750"
#: src/main/xmli18n-tmp.h:773
msgid "Kyocera FS-3800"
-msgstr ""
+msgstr "Kyocera FS-3800"
#: src/main/xmli18n-tmp.h:774
msgid "Kyocera FS-5800C"
-msgstr ""
+msgstr "Kyocera FS-5800C"
#: src/main/xmli18n-tmp.h:775
msgid "Kyocera FS-5900C"
-msgstr ""
+msgstr "Kyocera FS-5900C"
#: src/main/xmli18n-tmp.h:776
msgid "Kyocera FS-6500"
-msgstr ""
+msgstr "Kyocera FS-6500"
#: src/main/xmli18n-tmp.h:777
msgid "Kyocera FS-6500+"
-msgstr ""
+msgstr "Kyocera FS-6500+"
#: src/main/xmli18n-tmp.h:778
msgid "Kyocera FS-6700"
-msgstr ""
+msgstr "Kyocera FS-6700"
#: src/main/xmli18n-tmp.h:779
msgid "Kyocera FS-7000"
-msgstr ""
+msgstr "Kyocera FS-7000"
#: src/main/xmli18n-tmp.h:780
msgid "Kyocera FS-7000+"
-msgstr ""
+msgstr "Kyocera FS-7000+"
#: src/main/xmli18n-tmp.h:781
msgid "Kyocera FS-8000C"
-msgstr ""
+msgstr "Kyocera FS-8000C"
#: src/main/xmli18n-tmp.h:782
msgid "Kyocera FS-9000"
-msgstr ""
+msgstr "Kyocera FS-9000"
#: src/main/xmli18n-tmp.h:783
msgid "Kyocera FS-9100DN"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
#: src/main/xmli18n-tmp.h:784
msgid "Kyocera FS-9500DN"
-msgstr ""
+msgstr "Kyocera FS-9500DN"
#: src/main/xmli18n-tmp.h:785
msgid "Kyocera KM-1530"
-msgstr ""
+msgstr "Kyocera KM-1530"
#: src/main/xmli18n-tmp.h:786
msgid "Kyocera KM-1810"
-msgstr ""
+msgstr "Kyocera KM-1810"
#: src/main/xmli18n-tmp.h:787
msgid "Kyocera KM-2030"
-msgstr ""
+msgstr "Kyocera KM-2030"
#: src/main/xmli18n-tmp.h:788
msgid "Kyocera KM-2530"
-msgstr ""
+msgstr "Kyocera KM-2530"
#: src/main/xmli18n-tmp.h:789
msgid "Kyocera KM-3530"
-msgstr ""
+msgstr "Kyocera KM-3530"
#: src/main/xmli18n-tmp.h:790
msgid "Kyocera KM-4230"
-msgstr ""
+msgstr "Kyocera KM-4230"
#: src/main/xmli18n-tmp.h:791
msgid "Kyocera KM-4530"
-msgstr ""
+msgstr "Kyocera KM-4530"
#: src/main/xmli18n-tmp.h:792
msgid "Kyocera KM-5230"
-msgstr ""
+msgstr "Kyocera KM-5230"
#: src/main/xmli18n-tmp.h:793
msgid "Kyocera KM-5530"
-msgstr ""
+msgstr "Kyocera KM-5530"
#: src/main/xmli18n-tmp.h:794
msgid "Kyocera KM-6230"
-msgstr ""
+msgstr "Kyocera KM-6230"
#: src/main/xmli18n-tmp.h:795
msgid "Lexmark 4076"
-msgstr ""
+msgstr "Lexmark 4076"
#: src/main/xmli18n-tmp.h:796
msgid "Lexmark Optra E"
-msgstr ""
+msgstr "Lexmark Optra E"
#: src/main/xmli18n-tmp.h:797
msgid "Lexmark Optra E+"
-msgstr ""
+msgstr "Lexmark Optra E+"
#: src/main/xmli18n-tmp.h:798
msgid "Lexmark Valuewriter 300"
-msgstr ""
+msgstr "Lexmark Valuewriter 300"
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
-msgstr ""
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
-msgstr ""
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
-msgstr ""
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
-msgstr ""
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
-msgstr ""
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
-msgstr ""
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
-msgstr ""
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
-msgstr ""
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
-msgstr ""
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
-msgstr ""
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
-msgstr ""
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
-msgstr ""
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
#: src/main/xmli18n-tmp.h:811
msgid "Okidata OL400"
-msgstr ""
+msgstr "Okidata OL400"
#: src/main/xmli18n-tmp.h:812
msgid "Okidata OL400e"
-msgstr ""
+msgstr "Okidata OL400e"
#: src/main/xmli18n-tmp.h:813
msgid "Okidata OL400ex"
-msgstr ""
+msgstr "Okidata OL400ex"
#: src/main/xmli18n-tmp.h:814
msgid "Okidata OL410e"
-msgstr ""
+msgstr "Okidata OL410e"
#: src/main/xmli18n-tmp.h:815
msgid "Okidata OL600e"
-msgstr ""
+msgstr "Okidata OL600e"
#: src/main/xmli18n-tmp.h:816
msgid "Okidata OL610e/S"
-msgstr ""
+msgstr "Okidata OL610e/S"
#: src/main/xmli18n-tmp.h:817
msgid "Okidata OL800"
-msgstr ""
+msgstr "Okidata OL800"
#: src/main/xmli18n-tmp.h:818
msgid "Okidata OL810ex"
-msgstr ""
+msgstr "Okidata OL810ex"
#: src/main/xmli18n-tmp.h:819
msgid "Okidata Okipage 6e"
-msgstr ""
+msgstr "Okidata Okipage 6e"
#: src/main/xmli18n-tmp.h:820
msgid "Okidata Okipage 6ex"
-msgstr ""
+msgstr "Okidata Okipage 6ex"
#: src/main/xmli18n-tmp.h:821
msgid "Okidata Okipage 8p"
-msgstr ""
+msgstr "Okidata Okipage 8p"
#: src/main/xmli18n-tmp.h:822
msgid "Okidata Okipage 10e"
-msgstr ""
+msgstr "Okidata Okipage 10e"
#: src/main/xmli18n-tmp.h:823
msgid "Okidata Okipage 10ex"
-msgstr ""
+msgstr "Okidata Okipage 10ex"
#: src/main/xmli18n-tmp.h:824
msgid "Okidata Okipage 14ex"
-msgstr ""
+msgstr "Okidata Okipage 14ex"
#: src/main/xmli18n-tmp.h:825
msgid "Okidata Super 6e"
-msgstr ""
+msgstr "Okidata Super 6e"
#: src/main/xmli18n-tmp.h:826
msgid "Olivetti JP350S"
-msgstr ""
+msgstr "Olivetti JP350S"
#: src/main/xmli18n-tmp.h:827
msgid "Olivetti PG 306"
-msgstr ""
+msgstr "Olivetti PG 306"
#: src/main/xmli18n-tmp.h:828
msgid "PCPI 1030"
-msgstr ""
+msgstr "PCPI 1030"
#: src/main/xmli18n-tmp.h:829
msgid "Panasonic KX-P4410"
-msgstr ""
+msgstr "Panasonic KX-P4410"
#: src/main/xmli18n-tmp.h:830
msgid "Panasonic KX-P4450"
-msgstr ""
+msgstr "Panasonic KX-P4450"
#: src/main/xmli18n-tmp.h:831
msgid "Panasonic KX-P6150"
-msgstr ""
+msgstr "Panasonic KX-P6150"
#: src/main/xmli18n-tmp.h:832
msgid "Panasonic KX-P6500"
-msgstr ""
+msgstr "Panasonic KX-P6500"
#: src/main/xmli18n-tmp.h:833
msgid "Raven LP-410"
-msgstr ""
+msgstr "Raven LP-410"
#: src/main/xmli18n-tmp.h:834
msgid "Ricoh Aficio 220"
-msgstr ""
+msgstr "Ricoh Aficio 220"
#: src/main/xmli18n-tmp.h:835
msgid "Ricoh Aficio 401"
-msgstr ""
+msgstr "Ricoh Aficio 401"
#: src/main/xmli18n-tmp.h:836
msgid "Ricoh Aficio 700"
-msgstr ""
+msgstr "Ricoh Aficio 700"
#: src/main/xmli18n-tmp.h:837
msgid "Samsung ML-85"
-msgstr ""
+msgstr "Samsung ML-85"
#: src/main/xmli18n-tmp.h:838
msgid "Samsung ML-4600"
-msgstr ""
+msgstr "Samsung ML-4600"
#: src/main/xmli18n-tmp.h:839
msgid "Samsung ML-5000a"
-msgstr ""
+msgstr "Samsung ML-5000a"
#: src/main/xmli18n-tmp.h:840
msgid "Samsung ML-6000"
-msgstr ""
+msgstr "Samsung ML-6000"
#: src/main/xmli18n-tmp.h:841
msgid "Samsung ML-6100"
-msgstr ""
+msgstr "Samsung ML-6100"
#: src/main/xmli18n-tmp.h:842
msgid "Samsung ML-7000"
-msgstr ""
+msgstr "Samsung ML-7000"
#: src/main/xmli18n-tmp.h:843
msgid "Samsung ML-7000N"
-msgstr ""
+msgstr "Samsung ML-7000N"
#: src/main/xmli18n-tmp.h:844
msgid "Samsung ML-7000P"
-msgstr ""
+msgstr "Samsung ML-7000P"
#: src/main/xmli18n-tmp.h:845
msgid "Samsung ML-7050"
-msgstr ""
+msgstr "Samsung ML-7050"
#: src/main/xmli18n-tmp.h:846
msgid "Samsung QL-5100A"
-msgstr ""
+msgstr "Samsung QL-5100A"
#: src/main/xmli18n-tmp.h:847
msgid "Samsung QL-6050"
-msgstr ""
+msgstr "Samsung QL-6050"
#: src/main/xmli18n-tmp.h:848
msgid "Seiko SpeedJET 200"
-msgstr ""
+msgstr "Seiko SpeedJET 200"
#: src/main/xmli18n-tmp.h:849
msgid "Sharp AR-161"
-msgstr ""
+msgstr "Sharp AR-161"
#: src/main/xmli18n-tmp.h:850
msgid "Sony IJP-V100"
-msgstr ""
+msgstr "Sony IJP-V100"
#: src/main/xmli18n-tmp.h:851
msgid "Star LS-04"
-msgstr ""
+msgstr "Star LS-04"
#: src/main/xmli18n-tmp.h:852
-#, fuzzy
msgid "Star LaserPrinter 8"
-msgstr "Konfigurera skrivare"
+msgstr "Star LaserPrinter 8"
#: src/main/xmli18n-tmp.h:853
msgid "Tally MT908"
-msgstr ""
+msgstr "Tally MT908"
#: src/main/xmli18n-tmp.h:854
msgid "Xerox Able 1406"
-msgstr ""
+msgstr "Xerox Able 1406"
#: src/main/xmli18n-tmp.h:855
msgid "Xerox DocuPrint 4508"
-msgstr ""
+msgstr "Xerox DocuPrint 4508"
#: src/main/xmli18n-tmp.h:856
msgid "Xerox DocuPrint C20"
-msgstr ""
+msgstr "Xerox DocuPrint C20"
#: src/main/xmli18n-tmp.h:857
msgid "Xerox DocuPrint N4512"
-msgstr ""
+msgstr "Xerox DocuPrint N4512"
#: src/main/xmli18n-tmp.h:858
msgid "Xerox DocuPrint N4512PS"
-msgstr ""
+msgstr "Xerox DocuPrint N4512PS"
#: src/main/xmli18n-tmp.h:859
msgid "Xerox DocuPrint P12"
-msgstr ""
+msgstr "Xerox DocuPrint P12"
#: src/main/xmli18n-tmp.h:860
msgid "Xerox DocuPrint P1202"
-msgstr ""
+msgstr "Xerox DocuPrint P1202"
#: src/main/xmli18n-tmp.h:861
msgid "Xerox DocuPrint P8e"
-msgstr ""
+msgstr "Xerox DocuPrint P8e"
#: src/main/xmli18n-tmp.h:862
msgid "Xerox Document Centre 400"
-msgstr ""
+msgstr "Xerox Document Centre 400"
#: src/main/xmli18n-tmp.h:863
msgid "Lexmark Z42"
-msgstr ""
+msgstr "Lexmark Z42"
#: src/main/xmli18n-tmp.h:864
msgid "Lexmark Z43"
-msgstr ""
+msgstr "Lexmark Z43"
#: src/main/xmli18n-tmp.h:865
msgid "Lexmark Z52"
-msgstr ""
+msgstr "Lexmark Z52"
#: src/main/xmli18n-tmp.h:866
msgid "Lexmark Z53"
-msgstr ""
+msgstr "Lexmark Z53"
#: src/main/xmli18n-tmp.h:867
msgid "Olympus P-10"
-msgstr ""
+msgstr "Olympus P-10"
#: src/main/xmli18n-tmp.h:868
msgid "Olympus P-11"
-msgstr ""
+msgstr "Olympus P-11"
#: src/main/xmli18n-tmp.h:869
msgid "Olympus P-200"
-msgstr ""
+msgstr "Olympus P-200"
#: src/main/xmli18n-tmp.h:870
msgid "Olympus P-300"
-msgstr ""
+msgstr "Olympus P-300"
#: src/main/xmli18n-tmp.h:871
msgid "Olympus P-300E"
-msgstr ""
+msgstr "Olympus P-300E"
#: src/main/xmli18n-tmp.h:872
msgid "Olympus P-300U"
-msgstr ""
+msgstr "Olympus P-300U"
#: src/main/xmli18n-tmp.h:873
msgid "Olympus P-330E"
-msgstr ""
+msgstr "Olympus P-330E"
#: src/main/xmli18n-tmp.h:874
msgid "Olympus P-330NE"
-msgstr ""
+msgstr "Olympus P-330NE"
#: src/main/xmli18n-tmp.h:875
msgid "Olympus P-400"
-msgstr ""
+msgstr "Olympus P-400"
#: src/main/xmli18n-tmp.h:876
msgid "Olympus P-440"
-msgstr ""
+msgstr "Olympus P-440"
#: src/main/xmli18n-tmp.h:877
msgid "Canon CP-100"
-msgstr ""
+msgstr "Canon CP-100"
#: src/main/xmli18n-tmp.h:878
msgid "Canon CP-200"
-msgstr ""
+msgstr "Canon CP-200"
#: src/main/xmli18n-tmp.h:879
msgid "Canon CP-220"
-msgstr ""
+msgstr "Canon CP-220"
#: src/main/xmli18n-tmp.h:880
msgid "Canon CP-300"
-msgstr ""
+msgstr "Canon CP-300"
#: src/main/xmli18n-tmp.h:881
msgid "Canon CP-330"
-msgstr ""
+msgstr "Canon CP-330"
#: src/main/xmli18n-tmp.h:882
msgid "Canon SELPHY-CP-400"
-msgstr ""
+msgstr "Canon SELPHY-CP-400"
#: src/main/xmli18n-tmp.h:883
msgid "Canon SELPHY-CP-500"
-msgstr ""
+msgstr "Canon SELPHY-CP-500"
#: src/main/xmli18n-tmp.h:884
msgid "Canon SELPHY-CP-510"
-msgstr ""
+msgstr "Canon SELPHY-CP-510"
#: src/main/xmli18n-tmp.h:885
msgid "Canon SELPHY-CP-600"
-msgstr ""
+msgstr "Canon SELPHY-CP-600"
#: src/main/xmli18n-tmp.h:886
msgid "Canon SELPHY-CP-710"
-msgstr ""
+msgstr "Canon SELPHY-CP-710"
#: src/main/xmli18n-tmp.h:887
msgid "Sony UP-DP10"
-msgstr ""
+msgstr "Sony UP-DP10"
#: src/main/xmli18n-tmp.h:888
msgid "Sony UP-DR150"
-msgstr ""
+msgstr "Sony UP-DR150"
#: src/main/xmli18n-tmp.h:889
msgid "Fujifilm Printpix-CX-400"
-msgstr ""
+msgstr "Fujifilm Printpix-CX-400"
#: src/main/xmli18n-tmp.h:890
msgid "Fujifilm Printpix-CX-550"
-msgstr ""
+msgstr "Fujifilm Printpix-CX-550"
#: src/main/xmli18n-tmp.h:891
msgid "RAW DATA 16 bit"
-msgstr ""
+msgstr "RÃ… DATA 16-bitar"
#: src/main/xmli18n-tmp.h:892
msgid "RAW DATA 8 bit"
-msgstr ""
+msgstr "RÃ… DATA 8-bitar"
#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
msgid "Inch"
-msgstr "tum"
+msgstr "Tum"
#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
msgid "Set the base unit of measurement to inches"
-msgstr "Ställ in grundenheten till tum"
+msgstr "Ställ in grundenheten till tum"
#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
msgid "cm"
@@ -6251,61 +5902,55 @@ msgstr "cm"
#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
msgid "Set the base unit of measurement to centimetres"
-msgstr "Ställ in grundenheten till centimeter"
+msgstr "Ställ in grundenheten till centimeter"
#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
-#, fuzzy
msgid "Points"
-msgstr "Skriv ut"
+msgstr "Punkter"
#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
-#, fuzzy
msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Ställ in grundenheten till tum"
+msgstr "Ställ in grundenheten för mått till punkter (1/72\")"
#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
msgid "mm"
-msgstr ""
+msgstr "mm"
#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
-#, fuzzy
msgid "Set the base unit of measurement to millimetres"
-msgstr "Ställ in grundenheten till centimeter"
+msgstr "Ställ in grundenheten för mått till millimeter"
#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
msgid "Pica"
-msgstr ""
+msgstr "Pica"
#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
-#, fuzzy
msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Ställ in grundenheten till tum"
+msgstr "Ställ in grundenheten för mått till pica (1/12\")"
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color output"
-msgstr "Färgutdata"
+msgstr "Färgutdata"
#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
msgid "Print in shades of gray using black ink"
-msgstr "Skriv ut i gråtoner genom att använda svart bläck"
+msgstr "Skriv ut i gråtoner genom att använda svart bläck"
#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
-#, fuzzy
msgid "Standard Command"
-msgstr "Standard"
+msgstr "Standard kommando"
#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
msgid "Use standard print command"
-msgstr ""
+msgstr "Använd standardkommando för utskrift"
#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
-#, fuzzy
msgid "Custom Command"
-msgstr "Kommando:"
+msgstr "Anpassat kommando"
#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
msgid "Use custom print command"
-msgstr ""
+msgstr "Använd anpassat kommando för utskrift"
#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
@@ -6314,22 +5959,20 @@ msgid "File"
msgstr "Fil"
#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
-#, fuzzy
msgid "Print to a file"
-msgstr "Skriv ut till fil?"
+msgstr "Skriv ut till en fil"
#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
msgid "Edit Curve..."
-msgstr ""
+msgstr "Redigera kurva..."
#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
-#, fuzzy
msgid "Set Default"
-msgstr "Ställ in standardvärden"
+msgstr "Ställ in standard"
#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
msgid "Restore Previous"
-msgstr ""
+msgstr "Återställ föregående"
#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
@@ -6360,7 +6003,7 @@ msgid ""
"Save Settings"
msgstr ""
"Skriv ut och\n"
-"spara inställningar"
+"spara inställningar"
#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
msgid ""
@@ -6368,7 +6011,7 @@ msgid ""
"Settings"
msgstr ""
"Spara\n"
-"inställningar"
+"inställningar"
#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
msgid "Print"
@@ -6376,7 +6019,7 @@ msgstr "Skriv ut"
#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
msgid "Preview"
-msgstr "Förhandsgranskning"
+msgstr "Förhandsgranskning"
#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
msgid ""
@@ -6391,73 +6034,70 @@ msgid ""
"If you click another button while dragging the mouse, the image will return "
"to its original position."
msgstr ""
-"Positionera bilden på sidan.\n"
-"Klicka och dra med huvudknappen för att positionera bilden.\n"
-"Klicka och dra med den andra knappen för att flytta bilden med finare "
+"Positionera bilden på sidan.\n"
+"Klicka och dra med huvudknappen för att positionera bilden.\n"
+"Klicka och dra med den andra knappen för att flytta bilden med finare "
"precision; varje flyttenhet flyttar bilden med en punkt (1/72\")\n"
-"Klicka och dra med den tredje (mittersta) musknappen för att flytta bilden i "
+"Klicka och dra med den tredje (mittersta) musknappen för att flytta bilden i "
"enheter av bildstorleken.\n"
-"Att hålla ned skifttangenten vid klickande och dragande begränsar flytten "
-"till rörelse i endast horisontell och vertikal led.\n"
-"Om du klickar någon annan knapp under tiden du drar med musen kommer bilden "
-"att återgå till sin ursprungliga position."
+"Att hålla ned skifttangenten vid klickande och dragande begränsar flytten "
+"till rörelse i endast horisontell och vertikal led.\n"
+"Om du klickar någon annan knapp under tiden du drar med musen kommer bilden "
+"att återgå till sin ursprungliga position."
#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
-#, fuzzy
msgid "Paper Size"
-msgstr "Storlek"
+msgstr "Pappersstorlek"
#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
msgid "Show All Paper Sizes"
-msgstr ""
+msgstr "Visa alla pappersstorlekar"
#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
msgid "Dimensions:"
msgstr "Dimensioner:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "Bredd:"
#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
msgid "Width of the paper that you wish to print to"
-msgstr "Bredd på pappret som du vill skriva ut till"
+msgstr "Bredd på pappret som du vill skriva ut till"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
-msgstr "Höjd:"
+msgstr "Höjd:"
#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
msgid "Height of the paper that you wish to print to"
-msgstr "Höjd på pappret som du vill skriva ut till"
+msgstr "Höjd på pappret som du vill skriva ut till"
#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
-#, fuzzy
msgid "Automatic Paper Size"
-msgstr "Storlek"
+msgstr "Automatisk pappersstorlek"
#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
msgid "Number of Copies"
-msgstr ""
+msgstr "Antal kopior"
#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr ""
+msgstr "Välj antalet kopior att skriva ut; ett värde mellan 1 och 100"
#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
-#, fuzzy
msgid "Image Position"
-msgstr "Position"
+msgstr "Bildposition"
#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
msgid "Auto"
-msgstr "Automatik"
+msgstr "Automatisk"
#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
msgid "Portrait"
-msgstr "Stående"
+msgstr "Stående"
#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
msgid "Landscape"
@@ -6476,7 +6116,7 @@ msgid ""
"Select the orientation: portrait, landscape, upside down, or seascape "
"(upside down landscape)"
msgstr ""
-"Välj orientering: stående, liggande, uppochner eller liggande uppochner"
+"Välj orientering: stående, liggande, uppochner eller liggande uppochner"
#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
msgid "Orientation:"
@@ -6484,32 +6124,32 @@ msgstr "Orientering:"
#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
msgid "Left:"
-msgstr "Vänster:"
+msgstr "Vänster:"
#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
msgid "Distance from the left of the paper to the image"
-msgstr "Avstånd från vänsterkanten på pappret till bilden"
+msgstr "Avstånd från vänsterkanten på pappret till bilden"
#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
msgid "Right:"
-msgstr "Höger:"
+msgstr "Höger:"
#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
msgid "Distance from the left of the paper to the right of the image"
-msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden"
+msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden"
#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
msgid "Distance from the right of the paper to the image"
-msgstr "Avstånd från högerkanten på pappret till bilden"
+msgstr "Avstånd från högerkanten på pappret till bilden"
#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
msgid "Top:"
-msgstr "Övre kant:"
+msgstr "Övre kant:"
#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
msgid "Distance from the top of the paper to the image"
-msgstr "Avstånd från överkanten på pappret till bilden"
+msgstr "Avstånd från överkanten på pappret till bilden"
#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
@@ -6517,57 +6157,52 @@ msgid "Bottom:"
msgstr "Nedre kant:"
#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
-#, fuzzy
msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Avstånd från överkanten på pappret till nederkanten på bilden"
+msgstr "Avstånd från överkanten på pappret till nederkanten på bilden"
#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
msgid "Distance from the bottom of the paper to the image"
-msgstr "Avstånd från nederkanten på pappret till bilden"
+msgstr "Avstånd från nederkanten på pappret till bilden"
#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
msgid "Center:"
msgstr "Centrera:"
#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
-#, fuzzy
msgid "Horizontal"
-msgstr "Horisontellt"
+msgstr "Horisontal"
#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
msgid "Center the image horizontally on the paper"
-msgstr "Centrera bilden horisontellt på pappret"
+msgstr "Centrera bilden horisontellt på pappret"
#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
msgid "Both"
-msgstr "Både och"
+msgstr "BÃ¥de och"
#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
msgid "Center the image on the paper"
-msgstr "Centrera bilden på pappret"
+msgstr "Centrera bilden på pappret"
#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
-#, fuzzy
msgid "Vertical"
-msgstr "Vertikalt"
+msgstr "Vertikal"
#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
msgid "Center the image vertically on the paper"
-msgstr "Centrera bilden vertikalt på pappret"
+msgstr "Centrera bilden vertikalt på pappret"
#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
msgid "Setup Printer"
msgstr "Konfigurera skrivare"
#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
-#, fuzzy
msgid "Printer Make:"
-msgstr "Skrivarnamn:"
+msgstr "Skrivarmärke:"
#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
-#, fuzzy
msgid "Select the make of your printer"
-msgstr "Välj din skrivarmodell"
+msgstr "Välj märke på din skrivare"
#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
@@ -6576,7 +6211,7 @@ msgstr "Skrivarmodell:"
#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
msgid "Select your printer model"
-msgstr "Välj din skrivarmodell"
+msgstr "Välj modell på din skrivare"
#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
msgid "PPD File:"
@@ -6584,49 +6219,44 @@ msgstr "PPD-fil:"
#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
msgid "Enter the correct PPD filename for your printer"
-msgstr "Ange rätt PPD-filnamn för din skrivare"
+msgstr "Ange rätt PPD-filnamn för din skrivare"
#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
msgid "Browse"
-msgstr "Bläddra"
+msgstr "Bläddra"
#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
msgid "Choose the correct PPD filename for your printer"
-msgstr "Välj rätt PPD-filnamn för din skrivare"
+msgstr "Välj rätt PPD-filnamn för din skrivare"
#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
-#, fuzzy
msgid ""
"Select the name of the output queue (not the type, or model, of printer) "
"that you wish to print to"
msgstr ""
-"Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
-"skriva ut till"
+"Välj namnet på utskriftskön (inte skrivarens typ eller modell) som du vill "
+"skriva ut på"
#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
-#, fuzzy
msgid "Printer Queue:"
-msgstr "Skrivarnamn:"
+msgstr "Skrivarkö:"
#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
-#, fuzzy
msgid "Enter the correct command to print to your printer. "
-msgstr "Ange rätt PPD-filnamn för din skrivare"
+msgstr "Ange korrekt kommando för att skriva ut på din skrivare. "
#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
msgid "Enter the file to print to. "
-msgstr ""
+msgstr "Ange filen att skriva till. "
#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
-#, fuzzy
msgid "File to print to"
-msgstr "testutskrift"
+msgstr "Fil att skriva ut till"
#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
-#, fuzzy
msgid "Print To File"
-msgstr "Skriv ut till fil?"
+msgstr "Skriv ut till fil"
#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
msgid "Define New Printer"
@@ -6642,17 +6272,14 @@ msgid "Enter the name you wish to give this logical printer"
msgstr "Ange det namn som du vill ge denna logiska skrivare"
#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
-#, fuzzy
msgid "About Gutenprint "
-msgstr "Om Gimp-Print "
+msgstr "Om Gutenprint "
#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
msgid "Gutenprint Version "
-msgstr "Gimp-Print version "
+msgstr "Gutenprint version "
#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
msgid ""
"\n"
"\n"
@@ -6677,26 +6304,26 @@ msgid ""
msgstr ""
"\n"
"\n"
-"Copyright © 1997-2001 Michael Sweet, Robert Krawitz,\n"
+"Copyright © 1997-2003 Michael Sweet, Robert Krawitz,\n"
"och resten av utvecklingsteamet bakom Gimp-Print.\n"
"\n"
-"Besök vår webbsida på http://gimp-print.sourceforge.net.\n"
+"Besök vår webbsida på http://gimp-print.sourceforge.net.\n"
"\n"
-"Följande text är en informell översättning som enbart tillhandahålls i\n"
-"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
-"originaltexten, som är bifogad nedan.\n"
+"Följande text är en informell översättning som enbart tillhandahålls i\n"
+"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
+"originaltexten, som är bifogad nedan.\n"
"\n"
-"Detta program är fri programvara. Du kan distribuera det och/eller\n"
+"Detta program är fri programvara. Du kan distribuera det och/eller\n"
"modifiera det under villkoren i GNU General Public License, publicerad\n"
-"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
-"någon senare version.\n"
+"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
+"någon senare version.\n"
"\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men\n"
-"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
-"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
-"Public License för ytterligare information.\n"
+"Detta program distribueras i hopp om att det ska vara användbart, men\n"
+"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
+"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
+"Public License för ytterligare information.\n"
"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
"detta program. Om inte, skriv till Free Software Foundation, In.,\n"
"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\n"
"\n"
@@ -6716,205 +6343,198 @@ msgstr ""
#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
msgid "Printer Settings"
-msgstr "Skrivarinställningar"
+msgstr "Skrivarinställningar"
#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
msgid ""
"Select the name of the printer (not the type, or model, of printer) that you "
"wish to print to"
msgstr ""
-"Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
+"Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
"skriva ut till"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "Konfigurera skrivare..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr ""
-"Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut "
+"Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut "
"till denna skrivare"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "Ny skrivare..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr ""
-"Ange en ny logisk skrivare. Detta kan användas för att namnge en samling "
-"inställningar som du vill komma ihåg för framtida användning."
+"Ange en ny logisk skrivare. Detta kan användas för att namnge en samling "
+"inställningar som du vill komma ihåg för framtida användning."
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
-#, fuzzy
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
-msgstr "Storlek"
+msgstr "Bildstorlek"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "Skalning:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
-msgstr "Ändra skalningen (storleken) på bilden"
+msgstr "Ändra skalningen (storleken) på bilden"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
-msgstr ""
+msgstr "Skala efter:"
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr ""
-"Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
+"Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
"utdatapunkter per tum"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "Procent"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
-msgstr "Skala utskriften till storleken på sidan"
+msgstr "Skala utskriften till storleken på sidan"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
-msgstr "PPI"
+msgstr "Punkter per tum"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "Skala utskriften till antalet punkter per tum"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
-msgstr "Ställ in bredden på utskriften"
+msgstr "Ställ in bredden på utskriften"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
-msgstr "Ställ in bredden på utskriften"
+msgstr "Ställ in bredden på utskriften"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
msgstr ""
-"Använd\n"
+"Använd\n"
"originalbildstorlek"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
-msgstr "Ställ in storleken på utskriften till storleken på sidan"
+msgstr "Ställ in storleken på utskriften till storleken på sidan"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
-msgstr "Justera utskriftsfärg"
+msgstr "Justera utskriftsfärg"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
-msgstr "Ställ in standardvärden"
+msgstr "Ställ in standardvärden"
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
-msgstr "Stäng"
+msgstr "Stäng"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
-msgstr "Förhandsgranskning av bild"
+msgstr "Förhandsgranskning av bild"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
-#, fuzzy
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
-msgstr "Utdatatyp:"
+msgstr "Utdata"
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr "Utdatatyp:"
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
-msgstr "Välj önskad typ av utdata"
+msgstr "Välj önskad typ av utdata"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "Justera utdata..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr ""
-"Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm"
+"Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
-#, fuzzy
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
-msgstr "Enheter:"
+msgstr "Storleksenheter:"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
-#, fuzzy
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
-msgstr "> "
+msgstr " "
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "Enheter:"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
-msgstr "Välj grundenheten för utskrift"
+msgstr "Välj grundenheten för utskrift"
#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
msgid "System V lp"
-msgstr ""
+msgstr "System V lp"
#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
msgid "Berkeley lpd (/etc/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/etc/lpc)"
#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/bsd/lpc)"
#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr ""
+msgstr "Berkeley lpd (/usr/etc/lpc"
#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/libexec/lpc)"
#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/sbin/lpc)"
#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
-#, fuzzy
msgid "Printer"
-msgstr "Skriv ut"
+msgstr "Skrivare"
#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
-#, fuzzy
msgid "(Default Printer)"
-msgstr "Konfigurera skrivare"
+msgstr "(Standardskrivare)"
#: src/gutenprintui2/curve.c:130
-#, fuzzy
msgid "Curve type"
-msgstr "Svart"
+msgstr "Kurvtyp"
#: src/gutenprintui2/curve.c:131
msgid "Is this curve linear, spline interpolated, or free-form"
@@ -6922,127 +6542,116 @@ msgstr ""
#: src/gutenprintui2/curve.c:139
msgid "Minimum X"
-msgstr ""
+msgstr "Minimalt X"
#: src/gutenprintui2/curve.c:140
msgid "Minimum possible value for X"
-msgstr ""
+msgstr "Minimalt möjligt värde för X"
#: src/gutenprintui2/curve.c:149
msgid "Maximum X"
-msgstr ""
+msgstr "Maximalt X"
#: src/gutenprintui2/curve.c:150
msgid "Maximum possible X value"
-msgstr ""
+msgstr "Maximalt möjligt X-värde"
#: src/gutenprintui2/curve.c:159
msgid "Minimum Y"
-msgstr ""
+msgstr "Minimalt Y"
#: src/gutenprintui2/curve.c:160
msgid "Minimum possible value for Y"
-msgstr ""
+msgstr "Minimalt möjligt värde för Y"
#: src/gutenprintui2/curve.c:169
msgid "Maximum Y"
-msgstr ""
+msgstr "Maximalt Y"
#: src/gutenprintui2/curve.c:170
msgid "Maximum possible value for Y"
-msgstr ""
+msgstr "Maximalt möjligt värde för Y"
#: src/gutenprintui2/gammacurve.c:418
msgid "_Gamma value"
-msgstr ""
+msgstr "_Gammavärde"
#: src/cups/genppd.c:133
-#, fuzzy
msgid "Printer Features"
-msgstr "Skrivarinställningar"
+msgstr "Skrivarfunktioner"
#: src/cups/genppd.c:134
-#, fuzzy
msgid "Output Control"
-msgstr "Utdatatyp:"
+msgstr ""
#: src/cups/genppd.c:139
-#, fuzzy
msgid "Common"
-msgstr "Kommando:"
+msgstr "Vanlig"
#: src/cups/genppd.c:140
-#, fuzzy
msgid "Extra 1"
-msgstr "Fack 1"
+msgstr "Extra 1"
#: src/cups/genppd.c:141
-#, fuzzy
msgid "Extra 2"
-msgstr "Fack 2"
+msgstr "Extra 2"
#: src/cups/genppd.c:142
-#, fuzzy
msgid "Extra 3"
-msgstr "Fack 3"
+msgstr "Extra 3"
#: src/cups/genppd.c:143
-#, fuzzy
msgid "Extra 4"
-msgstr "Fack 4"
+msgstr "Extra 4"
#: src/cups/genppd.c:144
msgid "Extra 5"
-msgstr ""
-
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-#, fuzzy
-msgid "Gutenprint"
-msgstr "testutskrift"
+msgstr "Extra 5"
# gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
#
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
msgstr "Swedish"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr "ISOLatin1"
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
-msgstr ""
+msgstr "Nej"
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
-msgstr ""
+msgstr "Ja"
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
-msgstr ""
+msgstr "Finjustering"
#: src/escputil/escputil.c:70
msgid "Escputil version "
msgstr "Escputil version "
#: src/escputil/escputil.c:71
-#, fuzzy
msgid ""
", Copyright (C) 2000-2006 Robert Krawitz\n"
"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; type 'escputil -l' for details.\n"
msgstr ""
-", Copyright © 2000-2001 Robert Krawitz\n"
-"Escputil kommer UTAN NÅGON SOM HELST GARANTI; skriv in \"escputil -l\" för\n"
-"mer information. Detta är fri programvara, och du är välkommen att\n"
-"vidaredistribuera det under vissa villkor; skriv in \"escputil -l\" för mer\n"
+", Copyright © 2000-2006 Robert Krawitz\n"
+"Escputil kommer UTAN NÅGON SOM HELST GARANTI; skriv in \"escputil -l\" för\n"
+"mer information. Detta är fri programvara, och du är välkommen att\n"
+"vidaredistribuera det under vissa villkor; skriv in \"escputil -l\" för mer\n"
"information.\n"
#: src/escputil/escputil.c:76
-#, fuzzy
msgid ""
"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
@@ -7060,23 +6669,23 @@ msgid ""
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
"\n"
-"Följande text är en informell översättning som enbart tillhandahålls i\n"
-"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
-"originaltexten, som är bifogad nedan.\n"
+"Följande text är en informell översättning som enbart tillhandahålls i\n"
+"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
+"originaltexten, som är bifogad nedan.\n"
"\n"
-"Detta program är fri programvara. Du kan distribuera det och/eller\n"
+"Detta program är fri programvara. Du kan distribuera det och/eller\n"
"modifiera det under villkoren i GNU General Public License, publicerad\n"
-"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
-"någon senare version.\n"
+"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
+"någon senare version.\n"
"\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men\n"
-"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
-"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
-"Public License för ytterligare information.\n"
+"Detta program distribueras i hopp om att det ska vara användbart, men\n"
+"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
+"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
+"Public License för ytterligare information.\n"
"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
"detta program. Om inte, skriv till Free Software Foundation, In.,\n"
"59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
"\n"
@@ -7092,10 +6701,9 @@ msgstr ""
"\n"
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
#: src/escputil/escputil.c:119
-#, fuzzy
msgid ""
"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
" [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -7140,49 +6748,53 @@ msgid ""
" -C|--choices Specify the number of pattern choices for alignment\n"
" -p|--patterns Specify the number of sets of patterns for alignment\n"
msgstr ""
-"Användning: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-" [-P skrivare | -r enhet] [-u] [-q] [-m modell]\n"
-"Utför underhåll på EPSON Stylus ®-skrivare.\n"
-"Exempel: escputil --clean-head --printer stpex-on-third-floor\n"
-" escputil --ink-level --new --raw-device /dev/lp0\n"
+"Användning: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+" [-P skrivare | -r enhet] [-u] [-q] [-m modell] [ -S ]\n"
+" [-C val] [-p mönster]\n"
+"Utför underhåll på EPSON Stylus®-skrivare.\n"
+"Exempel: escputil --ink-level --raw-device /dev/usb/lp0\n"
+" escputil --clean-head --new --printer-name MinKö\n"
"\n"
" Kommandon:\n"
" -c|--clean-head Rensa utskriftshuvudet.\n"
-" -n|--nozzle-check Skriv ut ett mönster för test av munstycken.\n"
-" Smutsiga eller igentäppta munstycken kommer att\n"
-" visas som mellanrum i mönstret. Om du ser några\n"
-" mellanrum bör du rensa utskriftshuvudet.\n"
+" -n|--nozzle-check Skriv ut ett mönster för test av munstycken.\n"
+" Smutsiga eller igentäppta munstycken kommer att\n"
+" visas som mellanrum i mönstret. Om du ser några\n"
+" mellanrum bör du rensa utskriftshuvudet.\n"
" -a|--align-head Justera utskriftshuvudet. VARNING: Felaktigt\n"
-" användande av detta verktyg kan resultera i dålig\n"
-" utskriftskvalitet och/eller skada på skrivaren.\n"
-" -o|--align-color Justera färgutskriftshuvudet (endast Stylus Color\n"
-" 480 och 580). VARNING: Felaktigt användande av detta\n"
-" verktyg kan resultera i dålig utskriftskvalitet\n"
-" och/eller skada på skrivaren.\n"
-" -s|--status Hämta skrivarstatus.\n"
-" -i|--ink-level Hämta information om bläcknivån i skrivaren. Detta\n"
-" kräver läs- och skrivrättigheter till den råa\n"
+" användande av detta verktyg kan resultera i dålig\n"
+" utskriftskvalitet och/eller skada på skrivaren.\n"
+" -s|--status Hämta skrivarstatus.\n"
+" -i|--ink-level Hämta information om bläcknivån i skrivaren. Detta\n"
+" kräver läs- och skrivrättigheter till den råa\n"
+" skrivarenheten.\n"
+" -e|--extended-ink-info Hämta utökad bläckinformation från\n"
+" skrivaren. Detta kräver läs/skrivåtkomst till den "
+"råa\n"
" skrivarenheten.\n"
-" -d|--identify Undersök skrivaren för information om märke och\n"
-" modell. Detta kräver läs- och skrivrättigheter till\n"
-" den råa skrivarenheten.\n"
-" -l|--license Visa licens- och garantivillkoren för detta program.\n"
-" -M|--list-models Visa de tillgängliga skrivarmodellerna.\n"
-" -h|--help Visa detta hjälpmeddelande.\n"
+" -d|--identify Undersök skrivaren för information om märke och\n"
+" modell. Detta kräver läs- och skrivrättigheter till\n"
+" den råa skrivarenheten.\n"
+" -l|--license Visa licens- och garantivillkoren för detta program.\n"
+" -M|--list-models Visa de tillgängliga skrivarmodellerna.\n"
+" -h|--help Visa detta hjälpmeddelande.\n"
" Flaggor:\n"
-" -P|--printer-name Ange namnet på skrivarkön som ska användas.\n"
-" Standardalternativet är standardskrivaren på\n"
+" -P|--printer-name Ange namnet på skrivarkön som ska användas.\n"
+" Standardalternativet är standardskrivaren på\n"
" systemet.\n"
-" -r|--raw-device Ange namnet på den enhet att skriva till direkt\n"
-" istället för att gå via en skrivarkö.\n"
-" -u|--new Skrivaren är en ny skrivare (Stylus Color 740 eller\n"
+" -r|--raw-device Ange namnet på den enhet att skriva till direkt\n"
+" istället för att gå via en skrivarkö.\n"
+" -u|--new Skrivaren är en ny skrivare (Stylus Color 740 eller\n"
" nyare).\n"
" -q|--quiet Visa inte rubriken.\n"
-" -m|--model Ange den exakta skrivarmodellen för justering av\n"
+" -S|--short-name Skriv ut det korta namnet på skrivaren med --"
+"identify.\n"
+" -m|--model Ange den exakta skrivarmodellen för justering av\n"
" huvud.\n"
+" -C|--choices Ange antalet mönsterval för justering\n"
+" -p|--patterns Ange antalet uppsättningar av mönster för justering\n"
#: src/escputil/escputil.c:161
-#, fuzzy
msgid ""
"Usage: escputil [OPTIONS] [COMMAND]\n"
"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7225,46 +6837,50 @@ msgid ""
" -C Specify the number of pattern choices for alignment\n"
" -p Specify the number of sets of patterns for alignment\n"
msgstr ""
-"Användning: escputil [FLAGGOR] [KOMMANDON]\n"
-"Användning: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-" [-P skrivare | -r enhet] [-u] [-q] [-m modell]\n"
-"Utför underhåll på EPSON Stylus ®-skrivare.\n"
-"Exempel: escputil -c -P stpex-on-third-floor\n"
-" escputil -i -u -r /dev/lp0\n"
+"Användning: escputil [FLAGGOR] [KOMMANDO]\n"
+"Användning: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+" [-P skrivare | -r enhet] [-u] [-q] [-m modell] [ -S ]\n"
+" [-C val] [-p mönster]\n"
+"Utför underhåll på EPSON Stylus®-skrivare.\n"
+"Exempel: escputil -i -r /dev/usb/lp0\n"
+" escputil -c -u -P MinKö\n"
"\n"
" Kommandon:\n"
" -c Rensa utskriftshuvudet.\n"
-" -n Skriv ut ett mönster för test av munstycken.\n"
-" Smutsiga eller igentäppta munstycken kommer att visas som\n"
-" mellanrum i mönstret. Om du ser några mellanrum bör du rensa\n"
+" -n Skriv ut ett mönster för test av munstycken.\n"
+" Smutsiga eller igentäppta munstycken kommer att visas som\n"
+" mellanrum i mönstret. Om du ser några mellanrum bör du rensa\n"
" utskriftshuvudet.\n"
-" -a Justera utskriftshuvudet. VARNING: Felaktigt användande av detta\n"
-" verktyg kan resultera i dålig utskriftskvalitet och/eller skada\n"
-" på skrivaren.\n"
-" -o Justera färgutskriftshuvudet (endast Stylus Color 480 och 580).\n"
-" VARNING: Felaktigt användande av detta verktyg kan resultera i\n"
-" dålig utskriftskvalitet och/eller skada på skrivaren.\n"
-" -s Hämta skrivarstatus.\n"
-" -i Hämta information om bläcknivån i skrivaren. Detta kräver läs- och\n"
-" skrivrättigheter till den råa skrivarenheten.\n"
-" -d Undersök skrivaren för information om märke och modell. Detta\n"
-" kräver läs- och skrivrättigheter till den råa skrivarenheten.\n"
-" -l Visa licens- och garantivillkoren för detta program.\n"
-" -M Visa de tillgängliga skrivarmodellerna.\n"
-" -h Visa detta hjälpmeddelande.\n"
+" -a Justera utskriftshuvudet. VARNING: Felaktigt användande av detta\n"
+" verktyg kan resultera i dålig utskriftskvalitet och/eller skada\n"
+" på skrivaren.\n"
+" -s Hämta skrivarstatus.\n"
+" -i Hämta information om bläcknivån i skrivaren. Detta kräver läs- och\n"
+" skrivrättigheter till den råa skrivarenheten.\n"
+" -e Hämta utökade bläckinformationen från skrivaren.\n"
+" Endast för R800-skrivare och vännter. Detta kräver\n"
+" läs/skrivåtkomst till den råa skrivarenheten.\n"
+" -d Undersök skrivaren för information om märke och modell. Detta\n"
+" kräver läs- och skrivrättigheter till den råa skrivarenheten.\n"
+" -l Visa licens- och garantivillkoren för detta program.\n"
+" -M Visa de tillgängliga skrivarmodellerna.\n"
+" -h Visa detta hjälpmeddelande.\n"
" Flaggor:\n"
-" -P Ange namnet på skrivarkön som ska användas.\n"
-" Standardalternativet är standardskrivaren på systemet.\n"
-" -r Ange namnet på den enhet att skriva till direkt istället för att\n"
-" gå via en skrivarkö.\n"
-" -u Skrivaren är en ny skrivare (Stylus Color 740 eller nyare).\n"
+" -P Ange namnet på skrivarkön som ska användas.\n"
+" Standardalternativet är standardskrivaren på systemet.\n"
+" -r Ange namnet på den enhet att skriva till direkt istället för att\n"
+" gå via en skrivarkö.\n"
+" -u Skrivaren är en ny skrivare (Stylus Color 740 eller nyare).\n"
" -q Visa inte rubriken.\n"
-" -m Ange den exakta skrivarmodellen för justering av huvud.\n"
+" -S Skriv ut det korta namnet på skrivaren med -d.\n"
+" -m Ange den exakta skrivarmodellen för justering av huvud.\n"
+" -C Ange antalet mönsterval för justering\n"
+" -p Ange antalet uppsättningar mönster för justering\n"
#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
#, c-format
msgid "You may only specify one printer or raw device."
-msgstr "Du kan endast ange en skrivare eller rå enhet."
+msgstr "Du kan endast ange en skrivare eller rå enhet."
#: src/escputil/escputil.c:345
#, c-format
@@ -7274,7 +6890,7 @@ msgstr "Du kan endast ange en skrivarmodell."
#: src/escputil/escputil.c:369
#, c-format
msgid "Alignment choices must be at least 1."
-msgstr ""
+msgstr "Justeringsval måste vara åtminstone 1."
#: src/escputil/escputil.c:376
#, c-format
@@ -7284,27 +6900,27 @@ msgstr ""
#: src/escputil/escputil.c:381
#, c-format
msgid "Unknown option %c\n"
-msgstr "Okänd flagga %c\n"
+msgstr "Okänd flagga %c\n"
#: src/escputil/escputil.c:389
#, c-format
msgid "Usage: %s [OPTIONS] command\n"
-msgstr ""
+msgstr "Användning: %s [FLAGGOR] kommando\n"
#: src/escputil/escputil.c:391
#, c-format
msgid "Type `%s --help' for more information.\n"
-msgstr ""
+msgstr "Skriv \"%s --help\" för mer information.\n"
#: src/escputil/escputil.c:393
#, c-format
msgid "Type `%s -h' for more information.\n"
-msgstr ""
+msgstr "Skriv \"%s -h\" för mer information.\n"
#: src/escputil/escputil.c:459
#, c-format
msgid "Cannot open device %s: %s\n"
-msgstr "Kan inte öppna enheten %s: %s\n"
+msgstr "Kan inte öppna enheten %s: %s\n"
#: src/escputil/escputil.c:482
#, c-format
@@ -7319,26 +6935,30 @@ msgstr "Kan inte skicka kommando till skrivare\n"
#: src/escputil/escputil.c:568
#, c-format
msgid "Read from printer timed out\n"
-msgstr ""
+msgstr "Läsning från skrivaren fick timeout\n"
#: src/escputil/escputil.c:573
#, c-format
msgid "Cannot read from %s: %s\n"
-msgstr "Kan inte läsa från %s: %s\n"
+msgstr "Kan inte läsa från %s: %s\n"
+
+#: src/escputil/escputil.c:747
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Skrivarstatus kräver att en rå enhet används.\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
+msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "Kan inte skriva till %s: %s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7347,7 +6967,7 @@ msgstr ""
"\n"
"Kan inte skriva till %s: %s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7356,228 +6976,228 @@ msgid ""
msgstr ""
"\n"
"Kan inte detektera skrivartyp.\n"
-"Använd flaggan -m för att ange din skrivarmodell.\n"
-
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+"Använd flaggan -m för att ange din skrivarmodell.\n"
+
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
-msgstr ""
+msgstr "Okänt"
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
-msgstr ""
+msgstr "Status: Fel\n"
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
-msgstr ""
+msgstr "Status: Upptagen\n"
-#: src/escputil/escputil.c:1020
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1036
+#, c-format
msgid "Status: Waiting\n"
-msgstr "Mättnad:"
+msgstr "Status: Väntar\n"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
-msgstr ""
+msgstr "Status: Overksam\n"
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
-msgstr ""
+msgstr "Status: Pausad\n"
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
-msgstr ""
+msgstr "Status: Rensar\n"
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
-msgstr ""
+msgstr "Status: Stänger ner\n"
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
-msgstr ""
+msgstr "Status: Okänt (%d)\n"
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
-msgstr ""
+msgstr "Fel: Ödesdigert fel\n"
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1077
+#, c-format
msgid "Error: Ink out\n"
-msgstr "Fel i indata\n"
+msgstr "Fel: Slut på bläck\n"
-#: src/escputil/escputil.c:1064
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1080
+#, c-format
msgid "Error: Paper out\n"
-msgstr "Fel i indata\n"
+msgstr "Fel: Slut på papper\n"
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
-msgstr ""
+msgstr "Fel: Kortläsningsfel\n"
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
-msgstr ""
+msgstr "Fel: Okänt (%d)\n"
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
-msgstr ""
+msgstr "Skriver ut självtest av munstycke\n"
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
-msgstr ""
+msgstr "Bläcknivåer:\n"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
-msgstr "Bläckfärg"
+msgstr "Bläckfärg"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
-msgstr "Återstående procent"
+msgstr "Återstående procent"
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
-msgstr ""
+msgstr "Varning: Svart bläcknivå är låg\n"
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
-msgstr ""
+msgstr "Varning: Okänt (%d)\n"
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
-msgstr ""
+msgstr "Jobbnamn: "
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
-msgstr ""
+msgstr "bläcknivåer"
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
-msgstr ""
+msgstr "status"
-#: src/escputil/escputil.c:1339
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1355
+#, c-format
msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
+msgstr "Få tag på %s kräver att en rå enhet används.\n"
-#: src/escputil/escputil.c:1451
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1461
+#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
+msgstr "Få tag på bläckinformation kräver att en rå enhet används.\n"
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
-msgstr ""
+msgstr "Datum"
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
-msgstr "Skrivaridentifiering kräver att en rå enhet används.\n"
+msgstr "Skrivaridentifiering kräver att en rå enhet används.\n"
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1693
+#, c-format
msgid "Cannot identify printer model.\n"
-msgstr "Du kan endast ange en skrivarmodell."
+msgstr "Kan inte identifiera skrivarmodellen.\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr "Rensar huvuden...\n"
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
-"Kör kontroll av munstycken, försäkra dig om att det finns papper i\n"
+"Kör kontroll av munstycken, försäkra dig om att det finns papper i\n"
"skrivaren.\n"
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7615,43 +7235,43 @@ msgid ""
"It is essential that you not turn your printer off during this procedure.\n"
"\n"
msgstr ""
-"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
+"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
"\n"
-"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
-"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
-"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
+"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
+"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
+"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
"verktygs korrekthet har inte granskats av Seiko Epson, och ingen som helst\n"
-"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
+"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
"dig.\n"
"\n"
-"Detta verktyg skriver ut %d testmönster. Varje mönster ser väldigt likt ut.\n"
-"Mönstren består av vertikala linjer som överlappar varandra. Under varje\n"
+"Detta verktyg skriver ut %d testmönster. Varje mönster ser väldigt likt ut.\n"
+"Mönstren består av vertikala linjer som överlappar varandra. Under varje\n"
"linjepar finns ett tal mellan %d och %d.\n"
"\n"
-"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
-"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
-"linje. Granska paren väldigt noggrannt för att hitta de som passar bäst.\n"
-"Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
-"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
-"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
-"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
+"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
+"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
+"linje. Granska paren väldigt noggrannt för att hitta de som passar bäst.\n"
+"Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
+"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
+"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
+"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
"pappret i pappersfacket innan du anger det.\n"
"\n"
-"Alla mönster är identiska, men de senare mönstren använder finare punkter\n"
-"för mer kritisk justering. Du måste genomföra alla passen för att justera\n"
-"skrivaren korrekt. Efter det att du har genomfört alla justeringspass\n"
-"kommer justeringsmönstren att skrivas ut en gång till. Du bör då finna att\n"
-"det mittersta paret (%d av %d) är det bästa av alla par.\n"
+"Alla mönster är identiska, men de senare mönstren använder finare punkter\n"
+"för mer kritisk justering. Du måste genomföra alla passen för att justera\n"
+"skrivaren korrekt. Efter det att du har genomfört alla justeringspass\n"
+"kommer justeringsmönstren att skrivas ut en gång till. Du bör då finna att\n"
+"det mittersta paret (%d av %d) är det bästa av alla par.\n"
"\n"
-"Efter att passen skrivs ut en gång till kommer du att erbjudas alternativen\n"
+"Efter att passen skrivs ut en gång till kommer du att erbjudas alternativen\n"
"att spara resultaten (s), upprepa proceduren (r), eller avsluta utan att\n"
-"spara (q). Att avsluta kommer inte att återställa de tidigare värdena, men\n"
-"att stänga av och sätta på skrivaren kommer att göra det. Om du avslutar\n"
-"måste du upprepa hela proceduren om du vill spara resultaten senare.\n"
-"Det är viktigt att du inte stänger av din skrivare under denna process.\n"
+"spara (q). Att avsluta kommer inte att återställa de tidigare värdena, men\n"
+"att stänga av och sätta på skrivaren kommer att göra det. Om du avslutar\n"
+"måste du upprepa hela proceduren om du vill spara resultaten senare.\n"
+"Det är viktigt att du inte stänger av din skrivare under denna process.\n"
"\n"
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7686,50 +7306,50 @@ msgid ""
"this procedure.\n"
"\n"
msgstr ""
-"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
+"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
"\n"
-"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
-"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
-"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
+"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
+"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
+"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
"verktygs korrekthet har inte granskats av Seiko Epson, och ingen som helst\n"
-"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
+"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
"dig.\n"
"\n"
-"Detta verktyg skriver ut ett testmönster som består av vertikala linjer som\n"
-"överlappar varandra. Under varje linjepar finns ett tal mellan %d och %d.\n"
+"Detta verktyg skriver ut ett testmönster som består av vertikala linjer som\n"
+"överlappar varandra. Under varje linjepar finns ett tal mellan %d och %d.\n"
"\n"
-"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
-"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
-"justering. Granska paren väldigt noggrannt för att hitta de som passar\n"
-"bäst. Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
-"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
-"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
-"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
+"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
+"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
+"justering. Granska paren väldigt noggrannt för att hitta de som passar\n"
+"bäst. Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
+"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
+"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
+"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
"pappret i pappersfacket innan du anger det.\n"
"\n"
-"Efter det att du har kört justeringsmönstret kommer det att skrivas ut en\n"
-"gång till. Du bör då finna att det mittersta paret (%d av %d) är det bästa\n"
+"Efter det att du har kört justeringsmönstret kommer det att skrivas ut en\n"
+"gång till. Du bör då finna att det mittersta paret (%d av %d) är det bästa\n"
"av alla par.\n"
-"Du kommer då att erbjudas alternativen att spara resultaten (s), upprepa\n"
+"Du kommer då att erbjudas alternativen att spara resultaten (s), upprepa\n"
"proceduren (r), eller avsluta utan att spara (q). Att avsluta kommer inte\n"
-"att återställa de tidigare värdena, men att stänga av och sätta på\n"
-"skrivaren kommer att göra det.\n"
-"Om du avslutar måste du upprepa hela proceduren om du vill spara resultaten\n"
-"senare. Det är viktigt att du inte stänger av din skrivare under denna\n"
+"att återställa de tidigare värdena, men att stänga av och sätta på\n"
+"skrivaren kommer att göra det.\n"
+"Om du avslutar måste du upprepa hela proceduren om du vill spara resultaten\n"
+"senare. Det är viktigt att du inte stänger av din skrivare under denna\n"
"process.\n"
"\n"
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n"
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
-msgstr ""
+msgstr "Avslutar\n"
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7740,51 +7360,51 @@ msgid ""
"You will then be asked to confirm your choice.\n"
"What do you want to do (s, q, r)?\n"
msgstr ""
-"Kontrollera den slutliga utskriften mycket noggrannt för att försäkra\n"
-"dig om att skrivaren är korrekt justerad. Du kan nu:\n"
+"Kontrollera den slutliga utskriften mycket noggrannt för att försäkra\n"
+"dig om att skrivaren är korrekt justerad. Du kan nu:\n"
" (s) Spara resultaten i skrivaren\n"
" (q) Avsluta utan att spara resultaten\n"
-" (r) Upprepa hela förloppet från början\n"
-"Du kommer att få bekräfta ditt val.\n"
-"Vad vill du göra (s, q, r)?\n"
+" (r) Upprepa hela förloppet från början\n"
+"Du kommer att få bekräfta ditt val.\n"
+"Vad vill du göra (s, q, r)?\n"
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
-"Bekräfta att du vill avsluta utan att spara genom att trycka \"q\" igen:\n"
+"Bekräfta att du vill avsluta utan att spara genom att trycka \"q\" igen:\n"
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
"If you wish to save the alignment, you must repeat this process.\n"
msgstr ""
-"OK, din skrivare är justerad, men justeringen har inte sparats.\n"
-"Om du vill spara justeringen måste du upprepa detta förlopp.\n"
+"OK, din skrivare är justerad, men justeringen har inte sparats.\n"
+"Om du vill spara justeringen måste du upprepa detta förlopp.\n"
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr ""
-"Bekräfta att du vill upprepa justeringsprocessen genom att\n"
+"Bekräfta att du vill upprepa justeringsprocessen genom att\n"
"ange \"r\" igen:\n"
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr "Upprepar justeringsprocessen.\n"
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7793,52 +7413,52 @@ msgid ""
"Please confirm by typing 's' again that you wish to save the settings\n"
"to your printer:\n"
msgstr ""
-"Detta kommer att permanent ändra din skrivares konfiguration.\n"
-"VARNING: detta förlopp har inte godkänts av Seiko Epson, och kan\n"
-"skada din skrivare. Vill du fortsätta?\n"
-"Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
+"Detta kommer att permanent ändra din skrivares konfiguration.\n"
+"VARNING: detta förlopp har inte godkänts av Seiko Epson, och kan\n"
+"skada din skrivare. Vill du fortsätta?\n"
+"Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
"\"s\" igen:\n"
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
-msgstr "Kommer att spara inställningar..."
+msgstr "Kommer att spara inställningar..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "misslyckades!\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
msgstr ""
-"Dina inställningar sparades inte utan problem. Du måste upprepa\n"
+"Dina inställningar sparades inte utan problem. Du måste upprepa\n"
"justeringsproceduren.\n"
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "lyckades!\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Dina justeringsinställningar har sparats till skrivaren.\n"
+msgstr "Dina justeringsinställningar har sparats till skrivaren.\n"
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
-msgstr "Okänt kommando.\n"
+msgstr "Okänt kommando.\n"
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
-msgstr "Sista kommandot bekräftades inte.\n"
+msgstr "Sista kommandot bekräftades inte.\n"
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7848,65 +7468,65 @@ msgid ""
"Please place a sheet of paper in your printer to begin the head\n"
"alignment procedure.\n"
msgstr ""
-"Denna procedur förutsätter att din skrivare är en Epson %s.\n"
-"Om detta inte är din skrivarmodell bör du trycka Control+C nu\n"
-"och välja din rätta skrivarmodell.\n"
+"Denna procedur förutsätter att din skrivare är en Epson %s.\n"
+"Om detta inte är din skrivarmodell bör du trycka Control+C nu\n"
+"och välja din rätta skrivarmodell.\n"
"\n"
-"Placera ett pappersark i skrivaren för att påbörja justeringen\n"
+"Placera ett pappersark i skrivaren för att påbörja justeringen\n"
"av huvudena.\n"
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
-msgstr "Tryck retur för att fortsätta > "
+msgstr "Tryck retur för att fortsätta > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
"pattern.\n"
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
msgstr ""
-"Granska utskriften och välj det bästa linjeparet i varje mönster.\n"
-"Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
+"Granska utskriften och välj det bästa linjeparet i varje mönster.\n"
+"Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
"proceduren.\n"
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "Pass %d"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "Mata in ett nytt pappersark.\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
-msgstr "Numret är utanför intervallet!\n"
+msgstr "Numret är utanför intervallet!\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
-msgstr "Jag kan inte förstå vad du skrev!\n"
+msgstr "Jag kan inte förstå vad du skrev!\n"
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n"
+msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n"
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
-msgstr "Försöker ställa in justering..."
+msgstr "Försöker ställa in justering..."
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "lyckades.\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7914,12 +7534,12 @@ msgid ""
"pattern %d. If it is not, you should repeat the process to get the best\n"
"quality printing.\n"
msgstr ""
-"Verifiera att justeringen är korrekt. Efter det att justeringsmönstret\n"
-"skrivits ut igen bör du försäkra dig om att det bästa mönstret för varje\n"
-"linje är mönster %d. Om det inte är det bör du upprepa proceduren för\n"
-"att få bästa utskriftskvalitet.\n"
+"Verifiera att justeringen är korrekt. Efter det att justeringsmönstret\n"
+"skrivits ut igen bör du försäkra dig om att det bästa mönstret för varje\n"
+"linje är mönster %d. Om det inte är det bör du upprepa proceduren för\n"
+"att få bästa utskriftskvalitet.\n"
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr "Fel i indata\n"
@@ -7928,7 +7548,7 @@ msgstr "Fel i indata\n"
msgid "Printing..."
msgstr "Skriver ut..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/Arkiv/Skriv ut..."
@@ -7943,116 +7563,133 @@ msgid ""
"ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
"not match the PPD file (%s).\n"
msgstr ""
+"ijsgutenprint: versionen av Gutenprint-programvaran som är installerad (%s)\n"
+" stämmer inte med PPD-filen (%s). Om du har uppgraderat din version\n"
+" av Gutenprint nyligen måste du installera om alla skrivarköer.\n"
+" Referera till din tillverkares dokumentation eller kommandot \"foomatic-"
+"ppdfile\"\n"
+" för instruktioner.\n"
+"FEL: ijsgutenprint: versionen av Gutenprint-programvaran installerad (%s) "
+"stämmer inte med PPD-filen (%s).\n"
-#: src/ghost/ijsgutenprint.c:190
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:191
+#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "Felaktigt färgutrymme: bps %d kanaler %d utrymme %s\n"
+msgstr ""
+"FEL: ijsgutenprint: Felaktigt färgutrymme: bps %d kanaler %d utrymme %s\n"
-#: src/ghost/ijsgutenprint.c:198
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:199
+#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "Ingen radbuffert\n"
+msgstr "FEL: ijsgutenprint: Ingen radbuffert\n"
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
+#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Kan inte tolka parametern %s=%s (ett tal förväntas)\n"
+msgstr ""
+"FEL: ijsgutenprint: Kan inte tolka parametern %s=%s (ett tal förväntas)\n"
-#: src/ghost/ijsgutenprint.c:497
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:498
+#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "Skrivaren måste anges med -sModel\n"
+msgstr "FEL: ijsgutenprint: Skrivaren måste anges med -sDeviceModel\n"
-#: src/ghost/ijsgutenprint.c:499
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:500
+#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "Skrivaren %s är inte en känd modell\n"
+msgstr "FEL: ijsgutenprint: Skrivaren %s är inte en känd modell\n"
-#: src/ghost/ijsgutenprint.c:655
+# DeviceModel är ett anrop?
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
-msgstr ""
+msgstr "ijsgutenprint: okänd DeviceModel %s\n"
-#: src/ghost/ijsgutenprint.c:699
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:700
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka TopLeft %s\n"
-#: src/ghost/ijsgutenprint.c:722
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:723
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka PaperSize %s\n"
-#: src/ghost/ijsgutenprint.c:794
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:795
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka kurvan %s\n"
-#: src/ghost/ijsgutenprint.c:801
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:802
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka %s float %s\n"
-#: src/ghost/ijsgutenprint.c:808
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:809
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka %s int %s\n"
-#: src/ghost/ijsgutenprint.c:815
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:816
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka %s dimension %s\n"
-#: src/ghost/ijsgutenprint.c:829
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:830
+#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+msgstr "FEL: ijsgutenprint: kan inte tolka %s boolean %s\n"
-#: src/ghost/ijsgutenprint.c:840
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:841
+#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Okänd skrivare %s\n"
+msgstr "FEL: ijsgutenprint: Felaktig parameter %s %d\n"
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, fuzzy, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
+msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
-#: src/ghost/ijsgutenprint.c:1303
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1308
+#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "image_init misslyckades %d\n"
+msgstr "FEL: ijsgutenprint: image_init misslyckades %d\n"
-#: src/ghost/ijsgutenprint.c:1314
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1319
+#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Kan inte öppna fildeskriptor: %s\n"
+msgstr "FEL: ijsgutenprint: Kunde inte öppna filidentifierare: %s\n"
-#: src/ghost/ijsgutenprint.c:1326
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1331
+#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Kan inte öppna %s: %s\n"
+msgstr "FEL: ijsgutenprint: Kunde inte öppna %s: %s\n"
-#: src/ghost/ijsgutenprint.c:1338
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1344
+#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "Okänd skrivare %s\n"
+msgstr "FEL: ijsgutenprint: Okänd skrivare %s\n"
-#: src/ghost/ijsgutenprint.c:1508
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1516
+#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Felaktiga parametrar; kan inte fortsätta!\n"
+msgstr "FEL: ijsgutenprint: Felaktiga parametrar; kan inte fortsätta!\n"
-#: src/ghost/ijsgutenprint.c:1526
-#, fuzzy, c-format
+#: src/ghost/ijsgutenprint.c:1534
+#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
+msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n"
+
+#~ msgid "Gutenprint"
+#~ msgstr "Gutenprint"
-#, fuzzy
#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "ijs_server_get_page_header misslyckades %d\n"
+#~ msgstr "FEL: ijsgutenprint: ijs_server_get_page_header misslyckades %d\n"
+
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Justera gulbalansen på utskriften"
#, fuzzy
#~ msgid "EPSON Stylus C50"
@@ -8075,10 +7712,6 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "Stylus C70"
#, fuzzy
-#~ msgid "EPSON Stylus C80"
-#~ msgstr "Stylus C80"
-
-#, fuzzy
#~ msgid "EPSON Stylus C82"
#~ msgstr "Stylus C82"
@@ -8347,47 +7980,36 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "Stylus Scan 2500"
#, fuzzy
-#~ msgid "EPSON E-100"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "Skrivaren stöder inte färgutskrift\n"
-
-#, fuzzy
#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Kan inte tolka utdata från skrivare\n"
+#~ msgstr "Kan inte tolka utdata från skrivare\n"
#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Justera gulbalansen på utskriften"
-
-#~ msgid "Printer status requires using a raw device.\n"
-#~ msgstr "Skrivarstatus kräver att en rå enhet används.\n"
+#~ msgid "Printer does not support listing ink types!\n"
+#~ msgstr "Skrivaren stöder inte färgutskrift\n"
#, fuzzy
#~ msgid "Gloss Balance"
-#~ msgstr "Justera gulbalansen på utskriften"
+#~ msgstr "Justera gulbalansen på utskriften"
#~ msgid ""
#~ "Printer alignment must be done with a raw device or else\n"
#~ "the -m option must be used to specify a printer.\n"
#~ msgstr ""
-#~ "Skrivarjustering måste göras med en rå enhet. I annat fall\n"
-#~ "måste flaggan -m användas för att ange en skrivare.\n"
+#~ "Skrivarjustering måste göras med en rå enhet. I annat fall\n"
+#~ "måste flaggan -m användas för att ange en skrivare.\n"
#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Försöker detektera skrivarmodell..."
+#~ msgstr "Försöker detektera skrivarmodell..."
#~ msgid ""
#~ "\n"
#~ "Cannot open %s read/write: %s\n"
#~ msgstr ""
#~ "\n"
-#~ "Kan inte öppna %s för läsning/skrivning: %s\n"
+#~ "Kan inte öppna %s för läsning/skrivning: %s\n"
#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Skrivarmodellen %s är okänd.\n"
+#~ msgstr "Skrivarmodellen %s är okänd.\n"
#, fuzzy
#~ msgid "Gimp-Print"
@@ -8396,38 +8018,38 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#, fuzzy
#~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
#~ msgstr ""
-#~ "Ställ in ljusstyrkan på utskriften.\n"
-#~ "0 är helt svart, 2 är helt vitt"
+#~ "Ställ in ljusstyrkan på utskriften.\n"
+#~ "0 är helt svart, 2 är helt vitt"
#~ msgid ""
#~ "Enter the correct command to print to your printer. Note: Please do not "
#~ "remove the `-l' or `-oraw' from the command string, or printing will "
#~ "probably fail!"
#~ msgstr ""
-#~ "Ange rätt kommando för atyy skriva ut till din skrivare. Obs: Ta inte "
-#~ "bort \"-l\" eller \"-oraw\" från kommandosträngen. Om du gör detta kommer "
+#~ "Ange rätt kommando för atyy skriva ut till din skrivare. Obs: Ta inte "
+#~ "bort \"-l\" eller \"-oraw\" från kommandosträngen. Om du gör detta kommer "
#~ "utskriften troligtvis att misslyckas!"
#~ msgid "PPD File?"
#~ msgstr "PPD-fil?"
#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: flaggan \"%s\" är flertydig\n"
+#~ msgstr "%s: flaggan \"%s\" är flertydig\n"
#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
+#~ msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
+#~ msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+#~ msgstr "%s: flaggan \"%s\" kräver ett argument\n"
#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: okänd flagga \"--%s\"\n"
+#~ msgstr "%s: okänd flagga \"--%s\"\n"
#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: okänd flagga \"%c%s\"\n"
+#~ msgstr "%s: okänd flagga \"%c%s\"\n"
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: illegal flagga -- %c\n"
@@ -8436,13 +8058,13 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "%s: ogiltig flagga -- %c\n"
#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: flaggan kräver ett argument -- %c\n"
+#~ msgstr "%s: flaggan kräver ett argument -- %c\n"
#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: flaggan \"-W %s\" är flertydig\n"
+#~ msgstr "%s: flaggan \"-W %s\" är flertydig\n"
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
+#~ msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
#, fuzzy
#~ msgid "Bright"
@@ -8450,7 +8072,7 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#, fuzzy
#~ msgid "Image is too wide for the page\n"
-#~ msgstr "Skala utskriften till storleken på sidan"
+#~ msgstr "Skala utskriften till storleken på sidan"
#, fuzzy
#~ msgid "Full Bleed"
@@ -8461,7 +8083,7 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "600 DPI enkelriktad"
#~ msgid "24x36"
-#~ msgstr "24×36"
+#~ msgstr "24×36"
#~ msgid "%.0f of %.0f\n"
#~ msgstr "%.0f av %.0f\n"
@@ -8471,32 +8093,20 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#, fuzzy
#~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimera utdata för den typ av bild som skrivs ut"
+#~ msgstr "Optimera utdata för den typ av bild som skrivs ut"
#~ msgid "Solid Colors"
-#~ msgstr "Enstaka färger"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
+#~ msgstr "Enstaka färger"
#~ msgid "Stylus C20ux"
#~ msgstr "Stylus C20ux"
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
#~ msgid "Stylus C40ux"
#~ msgstr "Stylus C40ux"
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C41sx"
-
#~ msgid "Stylus C41ux"
#~ msgstr "Stylus C41ux"
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C42sx"
-
#~ msgid "Stylus C42ux"
#~ msgstr "Stylus C42ux"
@@ -8538,60 +8148,60 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n"
#~ "damage your printer!\n"
#~ msgstr ""
-#~ "Läs dessa instruktioner noggrannt innan du fortsätter.\n"
+#~ "Läs dessa instruktioner noggrannt innan du fortsätter.\n"
#~ "\n"
-#~ "Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
-#~ "Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan "
-#~ "göra\n"
-#~ "att utskriftskvaliteten försämras och att din skrivare kanske skadas. "
+#~ "Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
+#~ "Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan "
+#~ "göra\n"
+#~ "att utskriftskvaliteten försämras och att din skrivare kanske skadas. "
#~ "Detta\n"
#~ "verktygs korrekthet har inte granskats av Seiko Epson, och ingen som "
#~ "helst\n"
-#~ "garanti medföljer. Hela ansvaret för användande av detta program vilar "
-#~ "på\n"
+#~ "garanti medföljer. Hela ansvaret för användande av detta program vilar "
+#~ "på\n"
#~ "dig.\n"
#~ "\n"
-#~ "Detta verktyg skriver ut %d överlappande testmönster på ett papper. Det\n"
-#~ "skriver ut ett mönster och matar sedan ut sidan. Du måste sedan mata in\n"
-#~ "samma papper igen, och den kommer att skriva ut ett nytt mönster. Varje\n"
-#~ "mönster består av ett antal alternativ numrerade från %d till %d.\n"
+#~ "Detta verktyg skriver ut %d överlappande testmönster på ett papper. Det\n"
+#~ "skriver ut ett mönster och matar sedan ut sidan. Du måste sedan mata in\n"
+#~ "samma papper igen, och den kommer att skriva ut ett nytt mönster. Varje\n"
+#~ "mönster består av ett antal alternativ numrerade från %d till %d.\n"
#~ "\n"
-#~ "När du granskar mönstren bör du leta efter det som har den mjukaste\n"
-#~ "ytan (minst \"korn\"). Granska mönstren väldigt noggrannt för att hitta\n"
-#~ "det bästa. Vi föreslår att du använder bläckstrålepapper av fotokvalitet\n"
-#~ "Om du inte hittar ett mjukt mönster bör du upprepa testerna.\n"
+#~ "När du granskar mönstren bör du leta efter det som har den mjukaste\n"
+#~ "ytan (minst \"korn\"). Granska mönstren väldigt noggrannt för att hitta\n"
+#~ "det bästa. Vi föreslår att du använder bläckstrålepapper av fotokvalitet\n"
+#~ "Om du inte hittar ett mjukt mönster bör du upprepa testerna.\n"
#~ "\n"
-#~ "Efter att du har granskat alternativen och valt ett mönster kommer du "
+#~ "Efter att du har granskat alternativen och valt ett mönster kommer du "
#~ "att\n"
#~ "erbjudas alternativen att spara resultaten (s) i skrivaren, upprepa\n"
#~ "proceduren (r), eller avsluta utan att spara (q). Att avsluta kommer "
#~ "inte\n"
-#~ "att återställa de tidigare värdena, men att stänga av och sätta på\n"
-#~ "skrivaren kommer att göra det. Om du avslutar måste du upprepa hela\n"
-#~ "proceduren om du vill spara resultaten senare. Det är viktigt att du "
+#~ "att återställa de tidigare värdena, men att stänga av och sätta på\n"
+#~ "skrivaren kommer att göra det. Om du avslutar måste du upprepa hela\n"
+#~ "proceduren om du vill spara resultaten senare. Det är viktigt att du "
#~ "inte\n"
-#~ "stänger av din skrivare under denna process.\n"
+#~ "stänger av din skrivare under denna process.\n"
#~ "\n"
-#~ "VARNING: DENNA FUNKTION ÄR INTE TESTAD ÄN! Den kanske inte fungerar, och\n"
+#~ "VARNING: DENNA FUNKTION ÄR INTE TESTAD ÄN! Den kanske inte fungerar, och\n"
#~ "den kanske skadar din skrivare!\n"
#~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr "Skrivaren %s kräver inte justering av färgutskriftshuvudet.\n"
+#~ msgstr "Skrivaren %s kräver inte justering av färgutskriftshuvudet.\n"
#~ msgid ""
#~ "Please inspect the print, and choose the pattern in each set.\n"
#~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
#~ msgstr ""
-#~ "Granska utskriften och välj mönstret i varje par.\n"
-#~ "Skriv in ett mönsternummer, \"?\" för hjälp, eller \"r\" för att upprepa "
+#~ "Granska utskriften och välj mönstret i varje par.\n"
+#~ "Skriv in ett mönsternummer, \"?\" för hjälp, eller \"r\" för att upprepa "
#~ "proceduren.\n"
#, fuzzy
#~ msgid "Model %d out of range.\n"
-#~ msgstr "Numret är utanför intervallet!\n"
+#~ msgstr "Numret är utanför intervallet!\n"
#~ msgid "Right Border:"
-#~ msgstr "Högerkant:"
+#~ msgstr "Högerkant:"
#~ msgid "Bottom Border:"
#~ msgstr "Nederkant:"
@@ -8600,7 +8210,7 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "Storlek"
#~ msgid "Image / Output Settings"
-#~ msgstr "Bild-/utdatainställningar"
+#~ msgstr "Bild-/utdatainställningar"
#, fuzzy
#~ msgid "GIMP-print"
@@ -8608,7 +8218,7 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#, fuzzy
#~ msgid "Resolutions"
-#~ msgstr "Upplösning"
+#~ msgstr "Upplösning"
#~ msgid "Media Type:"
#~ msgstr "Mediatyp:"
@@ -8620,61 +8230,61 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "Mediastorlek:"
#~ msgid "Size of paper that you wish to print to"
-#~ msgstr "Storlek på pappret som du vill skriva ut till"
+#~ msgstr "Storlek på pappret som du vill skriva ut till"
#~ msgid "Media Source:"
-#~ msgstr "Mediakälla:"
+#~ msgstr "Mediakälla:"
#~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "Källa (inmatningsfack) med media som du skriver ut till"
+#~ msgstr "Källa (inmatningsfack) med media som du skriver ut till"
#~ msgid "Ink Type:"
-#~ msgstr "Bläcktyp:"
+#~ msgstr "Bläcktyp:"
#~ msgid "Resolution:"
-#~ msgstr "Upplösning:"
+#~ msgstr "Upplösning:"
#~ msgid "Print in black and white (no color, and no shades of gray)"
-#~ msgstr "Skriv ut i svartvitt (ingen färg och inga gråtoner)"
+#~ msgstr "Skriv ut i svartvitt (ingen färg och inga gråtoner)"
#~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "Snabbaste och ljusaste färg för text och linjegrafik"
+#~ msgstr "Snabbaste och ljusaste färg för text och linjegrafik"
#~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "Bäst för bilder som domineras av enfärgade områden"
+#~ msgstr "Bäst för bilder som domineras av enfärgade områden"
#~ msgid ""
#~ "Slowest, but most accurate and smoothest color for continuous tone images "
#~ "and photographs"
#~ msgstr ""
-#~ "Långsammast, men noggrannast och mjukast färg för bilder med färgskalor "
+#~ "Långsammast, men noggrannast och mjukast färg för bilder med färgskalor "
#~ "och fotografier"
#~ msgid "Dither Algorithm:"
-#~ msgstr "Färgutjämningsalgoritm:"
+#~ msgstr "Färgutjämningsalgoritm:"
#~ msgid ""
#~ "\n"
#~ "Cannot read from %s: %s\n"
#~ msgstr ""
#~ "\n"
-#~ "Kan inte läsa från %s: %s\n"
+#~ "Kan inte läsa från %s: %s\n"
#~ msgid "%s is not a valid parameter of type %s\n"
-#~ msgstr "%s är inte en giltig parameter av typen %s\n"
+#~ msgstr "%s är inte en giltig parameter av typen %s\n"
#~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s är utanför intervallet (värde %f, min %f, max %f)\n"
+#~ msgstr "%s är utanför intervallet (värde %f, min %f, max %f)\n"
#~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s är inte en giltig färgutjämningsalgoritm\n"
+#~ msgstr "%s är inte en giltig färgutjämningsalgoritm\n"
#~ msgid ""
#~ "Please re-insert the same alignment sheet in the printer when it is\n"
#~ "finished printing.\n"
#~ msgstr ""
#~ "Mata in samma justeringspapper i skrivaren efter det att utskriften\n"
-#~ "är klar.\n"
+#~ "är klar.\n"
#~ msgid ""
#~ "Inspect the alignment sheet, and determine which pattern is the "
@@ -8684,17 +8294,17 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ "best pattern, and repeat the procedure.\n"
#~ "Type a pattern number, or '?' for help.\n"
#~ msgstr ""
-#~ "Granska justeringspappret och bestäm vilket mönster som är mjukast.\n"
-#~ "Detta mönster har den minsta kornigheten.\n"
-#~ "Om du inte kan hitta ett mjukt mönster bör du välja numret för det\n"
-#~ "bästa mönstret och upprepa proceduren.\n"
-#~ "Ange ett mönsternummer, eller \"?\" för hjälp.\n"
+#~ "Granska justeringspappret och bestäm vilket mönster som är mjukast.\n"
+#~ "Detta mönster har den minsta kornigheten.\n"
+#~ "Om du inte kan hitta ett mjukt mönster bör du välja numret för det\n"
+#~ "bästa mönstret och upprepa proceduren.\n"
+#~ "Ange ett mönsternummer, eller \"?\" för hjälp.\n"
#~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "Det bästa mönstret ska vara numrerat mellan 1 och %d.\n"
+#~ msgstr "Det bästa mönstret ska vara numrerat mellan 1 och %d.\n"
#~ msgid "Set the contrast of the print"
-#~ msgstr "Ställ in kontrasten på utskriften"
+#~ msgstr "Ställ in kontrasten på utskriften"
#~ msgid "Cyan:"
#~ msgstr "Cyan:"
@@ -8706,16 +8316,16 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "Gult:"
#~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "Parametern %s är utanför intervallet (värde %f, min %f, max %f)\n"
+#~ msgstr "Parametern %s är utanför intervallet (värde %f, min %f, max %f)\n"
#~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "Parametern %s är utanför intervallet (värde %d, min %d, max %d)\n"
+#~ msgstr "Parametern %s är utanför intervallet (värde %d, min %d, max %d)\n"
#~ msgid "Unknown option %s\n"
-#~ msgstr "Okänd flagga %s\n"
+#~ msgstr "Okänd flagga %s\n"
#~ msgid "13x19"
-#~ msgstr "13×19"
+#~ msgstr "13×19"
#~ msgid "Monarch"
#~ msgstr "Monarch"
@@ -8733,53 +8343,53 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "HP-gratulationskort"
#~ msgid "1440 x 360 DPI"
-#~ msgstr "1440 × 360 DPI"
+#~ msgstr "1440 × 360 DPI"
#~ msgid "1440 x 360 DPI Unidirectional"
-#~ msgstr "1440 × 360 DPI enkelriktad"
+#~ msgstr "1440 × 360 DPI enkelriktad"
#~ msgid "1440 x 360 DPI High Quality Uni"
-#~ msgstr "1440 × 360 DPI enkelriktad hög kvalitet"
+#~ msgstr "1440 × 360 DPI enkelriktad hög kvalitet"
#~ msgid ""
#~ "Please insert your alignment test page in the printer once more\n"
#~ "for the final save of your alignment settings. When the printer\n"
#~ "feeds the page through, your settings have been saved.\n"
#~ msgstr ""
-#~ "Mata in din justeringstestsida en gång till i skrivaren för det\n"
-#~ "slutgiltiga sparandet av justeringsinställningarna. När skrivaren\n"
-#~ "matar igenom pappret är dina inställningar sparade.\n"
+#~ "Mata in din justeringstestsida en gång till i skrivaren för det\n"
+#~ "slutgiltiga sparandet av justeringsinställningarna. När skrivaren\n"
+#~ "matar igenom pappret är dina inställningar sparade.\n"
#~ msgid ""
#~ "Please inspect the print, and choose the best pair of lines\n"
#~ "in pattern #%d, and then insert a fresh page in the input tray.\n"
#~ "Type a pair number, '?' for help, or 'r' to retry this pattern.\n"
#~ msgstr ""
-#~ "Granska utskriften, och välj det bästa linjeparet i mönster nummer %d,\n"
+#~ "Granska utskriften, och välj det bästa linjeparet i mönster nummer %d,\n"
#~ "och mata sedan in en ny sida i inmatningsfacket. Skriv in ett parnummer,\n"
-#~ "\"?\" för hjälp, eller \"r\" för att upprepa försöket med detta mönster.\n"
+#~ "\"?\" för hjälp, eller \"r\" för att upprepa försöket med detta mönster.\n"
#~ msgid ""
#~ "Aligning phase %d, and performing final test.\n"
#~ "Please insert a fresh sheet of paper.\n"
#~ msgstr ""
-#~ "Justeringsfas %d, och utför sista testet.\n"
+#~ "Justeringsfas %d, och utför sista testet.\n"
#~ "Mata in ett nytt pappersark.\n"
#~ msgid "Aligning phase %d, and starting phase %d.\n"
#~ msgstr "Justeringsfas %d, och startar fas %d.\n"
#~ msgid "%s is not a valid page size\n"
-#~ msgstr "%s är inte en giltig pappersstorlek\n"
+#~ msgstr "%s är inte en giltig pappersstorlek\n"
#~ msgid "%s is not a valid media source\n"
-#~ msgstr "%s är inte en giltig mediakälla\n"
+#~ msgstr "%s är inte en giltig mediakälla\n"
#~ msgid "%s is not a valid resolution\n"
-#~ msgstr "%s är inte en giltig upplösning\n"
+#~ msgstr "%s är inte en giltig upplösning\n"
#~ msgid "%s is not a valid ink type\n"
-#~ msgstr "%s är inte en giltig bläcktyp\n"
+#~ msgstr "%s är inte en giltig bläcktyp\n"
#~ msgid "flsa"
#~ msgstr "flsa"
@@ -8788,15 +8398,15 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "flse"
#~ msgid "Center the image vertically on the paper!"
-#~ msgstr "Centrera bilden vertikalt på pappret!"
+#~ msgstr "Centrera bilden vertikalt på pappret!"
#~ msgid "Center the image on the paper!"
-#~ msgstr "Centrera bilden på pappret!"
+#~ msgstr "Centrera bilden på pappret!"
#~ msgid ""
#~ "Right\n"
#~ "Border:"
-#~ msgstr "Högerkant:"
+#~ msgstr "Högerkant:"
#~ msgid ""
#~ "Bottom\n"
@@ -8804,10 +8414,10 @@ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
#~ msgstr "Nederkant:"
#~ msgid "Select the orientation of the image"
-#~ msgstr "Välj bildens orientering"
+#~ msgstr "Välj bildens orientering"
#~ msgid "Setup"
-#~ msgstr "Inställningar"
+#~ msgstr "Inställningar"
#~ msgid "Scaling"
#~ msgstr "Skalning"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index a915bbb..080a958 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
Binary files differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3a3dd74..631644b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,16 +6,18 @@ msgid ""
msgstr ""
"Project-Id-Version: gutenprint 5.0.0-b5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-12 20:55-0400\n"
-"PO-Revision-Date: 2005-08-07 12:56+0800\n"
+"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"PO-Revision-Date: 2006-05-28 10:06-0400\n"
"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
#: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1529
+#: src/main/print-escp2.c:1609
msgid "Default"
msgstr "é è¨­"
@@ -27,66 +29,69 @@ msgstr "EvenTone"
msgid "Hybrid EvenTone"
msgstr "Hybrid EvenTone"
-#: src/main/dither-main.c:54
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
msgid "EvenBetter"
msgstr ""
-#: src/main/dither-main.c:55
+#: src/main/dither-main.c:54
msgid "Hybrid EvenBetter"
msgstr ""
-#: src/main/dither-main.c:61
+#: src/main/dither-main.c:60
msgid "UniTone"
msgstr "UniTone"
-#: src/main/dither-main.c:62
+#: src/main/dither-main.c:61
msgid "Hybrid UniTone"
msgstr "Hybrid UniTone"
-#: src/main/dither-main.c:64
+#: src/main/dither-main.c:63
msgid "Adaptive Hybrid"
msgstr "Adaptive Hybrid"
-#: src/main/dither-main.c:65
+#: src/main/dither-main.c:64
msgid "Ordered"
msgstr "Ordered"
-#: src/main/dither-main.c:66
+#: src/main/dither-main.c:65
msgid "Fast"
msgstr "Fast"
-#: src/main/dither-main.c:67
+#: src/main/dither-main.c:66
msgid "Very Fast"
msgstr "Very Fast"
-#: src/main/dither-main.c:68
+#: src/main/dither-main.c:67
msgid "Hybrid Floyd-Steinberg"
msgstr "Hybrid Floyd-Steinberg"
-#: src/main/dither-main.c:69
+#: src/main/dither-main.c:68
msgid "Predithered Input"
msgstr ""
-#: src/main/dither-main.c:89 src/main/print-color.c:56
+#: src/main/dither-main.c:88 src/main/print-color.c:56
msgid "Density"
msgstr "密度"
-#: src/main/dither-main.c:89 src/main/print-canon.c:1534
+#: src/main/dither-main.c:88 src/main/print-canon.c:1534
#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:413
-#: src/main/print-escp2.c:421 src/main/print-escp2.c:429
-#: src/main/print-escp2.c:437 src/main/print-escp2.c:445
-#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
+#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
+#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
+#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
-#: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
+#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
+#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
msgid "Output Level Adjustment"
msgstr ""
-#: src/main/dither-main.c:90
+#: src/main/dither-main.c:89
msgid ""
"Adjust the density (amount of ink) of the print. Reduce the density if the "
"ink bleeds through the paper or smears; increase the density if black "
@@ -95,15 +100,15 @@ msgstr ""
"調整列å°æ™‚墨點的密度。如果墨水太多,滲é€åˆ°ç´™å¼µèƒŒå¾Œæˆ–者弄髒紙張,請減低密度;"
"相å地,如果黑色看來ä¸å¤ å¯¦ï¼Œå‰‡æ‡‰å¢žåŠ å¯†åº¦ã€‚"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Dither Algorithm"
msgstr "擬色算法"
-#: src/main/dither-main.c:98
+#: src/main/dither-main.c:97
msgid "Screening Adjustment"
msgstr ""
-#: src/main/dither-main.c:99
+#: src/main/dither-main.c:98
msgid ""
"Choose the dither algorithm to be used.\n"
"Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -327,7 +332,7 @@ msgstr "其它"
#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1153 src/main/print-ps.c:66
+#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
msgid "Page Size"
msgstr "é é¢å°ºå¯¸"
@@ -342,58 +347,58 @@ msgstr "é é¢å°ºå¯¸"
#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
-#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
-#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
-#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
+#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
+#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
+#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
+#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
msgid "Basic Printer Setup"
msgstr "基本å°è¡¨æ©Ÿè¨­å®š"
#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1154 src/main/print-ps.c:67
+#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
msgid "Size of the paper being printed to"
msgstr "列å°æ™‚使用的紙張尺寸"
#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1240
+#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
msgid "Media Type"
msgstr "紙張類別"
#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1160 src/main/print-ps.c:73
+#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
msgid "Type of media (plain paper, photo paper, etc.)"
msgstr "紙張的類別 (普通紙ã€ç›¸ç´™ç­‰ç­‰)"
#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1264
+#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
msgid "Media Source"
msgstr "紙張來æº"
#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1166 src/main/print-ps.c:79
+#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
msgid "Source (input slot) of the media"
msgstr "é€ç´™åŒ£æˆ–者紙張的來æº"
#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1324
+#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
msgid "Resolution"
msgstr "解æžåº¦"
#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
-#: src/main/print-ps.c:85
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-ps.c:86
msgid "Resolution and quality of the print"
msgstr "列å°æ™‚的解æžåº¦åŠå“質"
#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Ink Type"
msgstr "墨水類別"
@@ -401,22 +406,22 @@ msgstr "墨水類別"
#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
-#: src/main/print-ps.c:90 src/main/print-raw.c:80
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
msgid "Advanced Printer Setup"
msgstr "進階å°è¡¨æ©Ÿè¨­å®š"
#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
-#: src/main/print-ps.c:91 src/main/print-raw.c:81
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-ps.c:92 src/main/print-raw.c:81
msgid "Type of ink in the printer"
msgstr "å°è¡¨æ©Ÿå¢¨æ°´çš„é¡žåž‹"
#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
+#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
msgid "Ink Channels"
msgstr ""
@@ -426,13 +431,13 @@ msgstr ""
#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1183
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
msgid "Advanced Printer Functionality"
msgstr "進階å°è¡¨æ©ŸåŠŸèƒ½"
#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Printing Mode"
msgstr "列å°æ¨¡å¼"
@@ -440,87 +445,87 @@ msgstr "列å°æ¨¡å¼"
#: src/main/print-color.c:192 src/main/print-color.c:200
#: src/main/print-color.c:208 src/main/print-escp2.c:320
#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
-#: src/main/print-ps.c:102 src/main/print-raw.c:86
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-ps.c:103 src/main/print-raw.c:86
msgid "Core Parameter"
msgstr ""
#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
+#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
msgid "Printing Output Mode"
msgstr ""
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1195
+#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
msgid "Double-Sided Printing"
msgstr "é›™é¢åˆ—å°"
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1196
+#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
msgid "Duplex/Tumble Setting"
msgstr ""
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
msgid "Cyan Density"
msgstr "æ°°è—色密度"
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:414
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
msgid "Adjust the cyan density"
msgstr "調整氰è—色色彩密度"
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
msgid "Magenta Density"
msgstr "洋紅色密度"
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:422
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
msgid "Adjust the magenta density"
msgstr "調整洋紅色色彩密度"
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
msgid "Yellow Density"
msgstr "黃色密度"
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:430
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
msgid "Adjust the yellow density"
msgstr "調整黃色色彩密度"
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
msgid "Black Density"
msgstr "黑色密度"
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:438
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
msgid "Adjust the black density"
msgstr "調整黑色色彩密度"
#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:469 src/main/print-escp2.c:470
+#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
msgid "Light Cyan Transition"
msgstr ""
#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:469
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:485
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:501
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:517
-#: src/main/print-escp2.c:525 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
msgid "Advanced Ink Adjustment"
msgstr ""
#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:477 src/main/print-escp2.c:478
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
msgid "Light Magenta Transition"
msgstr ""
@@ -528,13 +533,13 @@ msgstr ""
msgid "Light Yellow Transition"
msgstr ""
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1439
+#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
msgid "Off"
msgstr ""
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1441
+#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
msgid "Short Edge (Flip)"
msgstr ""
@@ -575,28 +580,28 @@ msgid "CMY Color"
msgstr "CMY 色系"
#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:737 src/main/print-escp2-data.c:750
-#: src/main/print-escp2-data.c:760 src/main/print-escp2-data.c:767
-#: src/main/print-escp2-data.c:779 src/main/print-escp2-data.c:791
-#: src/main/print-escp2-data.c:804 src/main/print-escp2-data.c:817
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:847
-#: src/main/print-escp2-data.c:860 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:965 src/escputil/escputil.c:986
-#: src/escputil/escputil.c:1190
+#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
+#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
+#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
+#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
+#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
+#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1206
msgid "Black"
msgstr "黑"
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1787
+#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
+#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
msgid "Color"
msgstr "彩色"
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1789
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1735
-#: src/main/print-ps.c:169 src/main/print-raw.c:137
+#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-ps.c:172 src/main/print-raw.c:137
msgid "Black and White"
msgstr "黑白"
@@ -779,15 +784,15 @@ msgstr ""
msgid "Gamma value assumed by application"
msgstr "程å¼ä½¿ç”¨çš„ Gamma 值"
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:738
-#: src/main/print-escp2-data.c:747 src/main/print-escp2-data.c:757
-#: src/main/print-escp2-data.c:768 src/main/print-escp2-data.c:780
-#: src/main/print-escp2-data.c:792 src/main/print-escp2-data.c:805
-#: src/main/print-escp2-data.c:818 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:861
-#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
-#: src/escputil/escputil.c:968 src/escputil/escputil.c:987
-#: src/escputil/escputil.c:1191
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
+#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
+#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
+#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
+#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
+#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
+#: src/escputil/escputil.c:1207
msgid "Cyan"
msgstr "æ°°è—"
@@ -795,15 +800,15 @@ msgstr "æ°°è—"
msgid "Adjust the cyan gamma"
msgstr "調整氰è—色 gamma 值"
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
-#: src/escputil/escputil.c:969 src/escputil/escputil.c:988
-#: src/escputil/escputil.c:1192
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
+#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
+#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
+#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
+#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
+#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
+#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
+#: src/escputil/escputil.c:1208
msgid "Magenta"
msgstr "æ´‹ç´…"
@@ -811,15 +816,15 @@ msgstr "æ´‹ç´…"
msgid "Adjust the magenta gamma"
msgstr "調整洋紅色 gamma 值"
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:830
-#: src/main/print-escp2-data.c:844 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
-#: src/escputil/escputil.c:970 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:1193
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
+#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
+#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
+#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
+#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
+#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
+#: src/escputil/escputil.c:1209
msgid "Yellow"
msgstr "黃"
@@ -827,10 +832,10 @@ msgstr "黃"
msgid "Adjust the yellow gamma"
msgstr "調整黃色 gamma 值"
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:835
-#: src/main/print-escp2-data.c:848 src/gutenprintui/panel.c:2152
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:977
-#: src/escputil/escputil.c:995
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
+#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/escputil/escputil.c:1011
msgid "Red"
msgstr "ç´…"
@@ -838,7 +843,7 @@ msgstr "ç´…"
msgid "Adjust the red gamma"
msgstr "調整紅色 gamma 值"
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
#: src/gutenprintui2/panel.c:2158
msgid "Green"
msgstr "綠"
@@ -847,10 +852,10 @@ msgstr "綠"
msgid "Adjust the green gamma"
msgstr "調整綠色 gamma 值"
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2166
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:978
-#: src/escputil/escputil.c:996
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
+#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1012
msgid "Blue"
msgstr "è—"
@@ -1148,158 +1153,158 @@ msgid ""
"d\n"
msgstr ""
-#: src/main/print-escp2-data.c:310 src/main/print-escp2-data.c:334
-#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:418
-#: src/main/print-escp2-data.c:460 src/main/print-escp2-data.c:502
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:689
-#: src/main/print-escp2-data.c:704 src/main/print-escp2-data.c:717
-#: src/main/print-escp2.c:1548 src/main/print-escp2.c:1640
-#: src/main/print-escp2.c:1652 src/main/print-pcl.c:227
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
+#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
+#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
+#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
+#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
+#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
+#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
msgid "Standard"
msgstr "標準"
-#: src/main/print-escp2-data.c:319 src/main/print-escp2-data.c:445
-#: src/main/print-escp2-data.c:487 src/main/print-escp2-data.c:529
-#: src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
+#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
+#: src/main/print-escp2-data.c:605
msgid "Roll Feed"
msgstr ""
-#: src/main/print-escp2-data.c:343 src/main/print-escp2-data.c:394
+#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
msgid "Roll Feed (cut each page)"
msgstr ""
-#: src/main/print-escp2-data.c:352 src/main/print-escp2-data.c:403
+#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
msgid "Roll Feed (do not cut)"
msgstr ""
-#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:427
+#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
msgid "Manual Feed"
msgstr "人手é€ç´™"
-#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:436
-#: src/main/print-escp2-data.c:538 src/main/print-escp2-data.c:571
+#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
+#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
msgid "Print to CD"
msgstr "列å°è‡³å…‰ç¢Ÿ"
-#: src/main/print-escp2-data.c:469 src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
#, fuzzy
msgid "Manual Sheet Guide"
msgstr "人手é€ç´™"
-#: src/main/print-escp2-data.c:478 src/main/print-escp2-data.c:520
+#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
#, fuzzy
msgid "Manual Feed (Front)"
msgstr "人手é€ç´™"
-#: src/main/print-escp2-data.c:553
+#: src/main/print-escp2-data.c:554
msgid "Rear Tray"
msgstr ""
-#: src/main/print-escp2-data.c:562
+#: src/main/print-escp2-data.c:563
msgid "Front Tray"
msgstr ""
-#: src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:581
#, fuzzy
msgid "Photo Board"
msgstr "相紙"
-#: src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:620
msgid "Cut Sheet Bin 1"
msgstr ""
-#: src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:629
msgid "Cut Sheet Bin 2"
msgstr ""
-#: src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:638
msgid "Cut Sheet Autoselect"
msgstr ""
-#: src/main/print-escp2-data.c:646
+#: src/main/print-escp2-data.c:647
msgid "Manual Selection"
msgstr ""
-#: src/main/print-escp2-data.c:686 src/main/print-escp2-data.c:701
+#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
#: src/main/generic-options.c:33
msgid "Fast Economy"
msgstr ""
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
+#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
#: src/main/generic-options.c:34
msgid "Economy"
msgstr ""
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/print-escp2-data.c:716 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
+#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
msgid "Draft"
msgstr ""
-#: src/main/print-escp2-data.c:690 src/main/print-escp2-data.c:705
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
+#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
msgid "High"
msgstr ""
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:718 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
+#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
msgid "Photo"
msgstr "相片"
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
+#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
msgid "Super Photo"
msgstr ""
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
+#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
msgid "Ultra Photo"
msgstr ""
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
msgid "Best"
msgstr ""
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:971 src/escputil/escputil.c:1194
+#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
+#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
+#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
msgid "Light Cyan"
msgstr ""
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:857
-#: src/escputil/escputil.c:972 src/escputil/escputil.c:1195
+#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
+#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
msgid "Light Magenta"
msgstr ""
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:975
+#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
+#: src/escputil/escputil.c:991
msgid "Light Black"
msgstr ""
-#: src/main/print-escp2-data.c:810
+#: src/main/print-escp2-data.c:811
msgid "Dark Yellow"
msgstr ""
-#: src/main/print-escp2-data.c:833 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:976
+#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
msgid "Matte Black"
msgstr ""
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:966
+#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
msgid "Photo Black"
msgstr ""
-#: src/main/print-escp2-data.c:837 src/escputil/escputil.c:979
+#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
msgid "Gloss Optimizer"
msgstr ""
-#: src/main/print-escp2-data.c:856 src/escputil/escputil.c:980
+#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
msgid "Light Light Black"
msgstr ""
@@ -1470,122 +1475,123 @@ msgstr ""
msgid "Adjust the red map"
msgstr ""
-#: src/main/print-escp2.c:445
+#: src/main/print-escp2.c:447
msgid "Red Density"
msgstr "紅色密度"
-#: src/main/print-escp2.c:446
+#: src/main/print-escp2.c:448
msgid "Adjust the red density"
msgstr "調整紅色色彩密度"
-#: src/main/print-escp2.c:453
+#: src/main/print-escp2.c:455
msgid "Blue Density"
msgstr "è—色密度"
-#: src/main/print-escp2.c:454
+#: src/main/print-escp2.c:456
msgid "Adjust the blue density"
msgstr "調整è—色色彩密度"
-#: src/main/print-escp2.c:461
+#: src/main/print-escp2.c:463
msgid "Gloss Level"
msgstr ""
-#: src/main/print-escp2.c:462
+#: src/main/print-escp2.c:464
msgid "Adjust the gloss level"
msgstr ""
-#: src/main/print-escp2.c:485 src/main/print-escp2.c:486
+#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
msgid "Dark Yellow Transition"
msgstr ""
-#: src/main/print-escp2.c:493 src/main/print-escp2.c:494
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
msgid "Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:501 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:525 src/main/print-escp2.c:526
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
msgid "Light Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:509 src/main/print-escp2.c:510
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
msgid "Dark Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:517
+#: src/main/print-escp2.c:527
msgid "Mid Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:528
msgid "Medium Gray Transition"
msgstr ""
-#: src/main/print-escp2.c:1445
+#: src/main/print-escp2.c:1525
msgid "Full Manual Control"
msgstr ""
-#: src/main/print-escp2.c:1447
+#: src/main/print-escp2.c:1527
msgid "Automatic Setting Control"
msgstr ""
-#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
msgid "CD - 5 inch"
msgstr "5 å‹å…‰ç¢Ÿ"
-#: src/main/print-escp2.c:1460 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
msgid "CD - 3 inch"
msgstr "3 å‹å…‰ç¢Ÿ"
-#: src/main/print-escp2.c:1482
+#: src/main/print-escp2.c:1562
msgid "Normal"
msgstr ""
-#: src/main/print-escp2.c:1484
+#: src/main/print-escp2.c:1564
msgid "Print To Hub"
msgstr ""
-#: src/main/print-escp2.c:1509 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
#: src/main/generic-options.c:230
msgid "Manual Control"
msgstr ""
-#: src/main/print-escp2.c:1619 src/cups/genppd.c:1333
+#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
msgid "Automatic"
msgstr "自動"
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1701
msgid "Bidirectional"
msgstr ""
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1703
msgid "Unidirectional"
msgstr ""
-#: src/main/print-escp2.c:1654
+#: src/main/print-escp2.c:1734
msgid "Alternate Fill"
msgstr ""
-#: src/main/print-escp2.c:1656
+#: src/main/print-escp2.c:1736
msgid "Ascending Fill"
msgstr ""
-#: src/main/print-escp2.c:1658
+#: src/main/print-escp2.c:1738
msgid "Descending Fill"
msgstr ""
-#: src/main/print-escp2.c:1660
+#: src/main/print-escp2.c:1740
msgid "Ascending Double"
msgstr ""
-#: src/main/print-escp2.c:1662
+#: src/main/print-escp2.c:1742
msgid "Nearest Neighbor Avoidance"
msgstr ""
-#: src/main/print-escp2.c:2087
+#: src/main/print-escp2.c:2168
#, c-format
msgid "This printer does not support raw printer output at depth %d\n"
msgstr ""
-#: src/main/print-escp2.c:3051 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
#: src/main/print-raw.c:217
msgid "Print options not verified; cannot print.\n"
msgstr ""
@@ -1752,8 +1758,8 @@ msgstr ""
msgid "Coated"
msgstr ""
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1450 src/cups/genppd.c:1465
-#: src/cups/genppd.c:1516
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
+#: src/cups/genppd.c:1514
msgid "None"
msgstr ""
@@ -1869,24 +1875,24 @@ msgstr "600x600 DPI 單色"
msgid "2400x600 DPI"
msgstr "2400x600 DPI"
-#: src/main/print-pcl.c:1427
+#: src/main/print-pcl.c:1467
msgid "Color + Black Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1428
+#: src/main/print-pcl.c:1468
msgid "Color + Photo Cartridges"
msgstr ""
-#: src/main/print-pcl.c:1440
+#: src/main/print-pcl.c:1480
msgid "Long Edge (Standard)"
msgstr ""
-#: src/main/print-ps.c:96
+#: src/main/print-ps.c:97
#, fuzzy
msgid "PPDFile"
msgstr "PPD 檔"
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
#: src/gutenprintui2/panel.c:1749
msgid "PPD File"
msgstr "PPD 檔"
@@ -5908,51 +5914,51 @@ msgid "Lexmark Valuewriter 300"
msgstr ""
#: src/main/xmli18n-tmp.h:799
-msgid "Minolta PagePro 1100"
+msgid "Minolta PagePro 6"
msgstr ""
#: src/main/xmli18n-tmp.h:800
-msgid "Minolta PagePro 6"
+msgid "Minolta PagePro 6e"
msgstr ""
#: src/main/xmli18n-tmp.h:801
-msgid "Minolta PagePro 6e"
+msgid "Minolta PagePro 6ex"
msgstr ""
#: src/main/xmli18n-tmp.h:802
-msgid "Minolta PagePro 6ex"
+msgid "Minolta PagePro 8"
msgstr ""
#: src/main/xmli18n-tmp.h:803
-msgid "Minolta PagePro 8"
+msgid "Minolta PagePro 8L"
msgstr ""
#: src/main/xmli18n-tmp.h:804
-msgid "Minolta PagePro 8L"
+msgid "Minolta PagePro 1100"
msgstr ""
#: src/main/xmli18n-tmp.h:805
-msgid "NEC SuperScript 1260"
+msgid "NEC SuperScript 660i"
msgstr ""
#: src/main/xmli18n-tmp.h:806
-msgid "NEC SuperScript 1400"
+msgid "NEC SuperScript 860"
msgstr ""
#: src/main/xmli18n-tmp.h:807
-msgid "NEC SuperScript 1800"
+msgid "NEC SuperScript 870"
msgstr ""
#: src/main/xmli18n-tmp.h:808
-msgid "NEC SuperScript 660i"
+msgid "NEC SuperScript 1260"
msgstr ""
#: src/main/xmli18n-tmp.h:809
-msgid "NEC SuperScript 860"
+msgid "NEC SuperScript 1400"
msgstr ""
#: src/main/xmli18n-tmp.h:810
-msgid "NEC SuperScript 870"
+msgid "NEC SuperScript 1800"
msgstr ""
#: src/main/xmli18n-tmp.h:811
@@ -6475,7 +6481,7 @@ msgstr "顯示所有紙張尺寸"
msgid "Dimensions:"
msgstr "尺寸:"
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
msgid "Width:"
msgstr "寬度:"
@@ -6484,7 +6490,7 @@ msgstr "寬度:"
msgid "Width of the paper that you wish to print to"
msgstr "列å°æ™‚的紙張寬度"
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
msgid "Height:"
msgstr "高度:"
@@ -6743,73 +6749,73 @@ msgid ""
"wish to print to"
msgstr "指定å°è¡¨æ©Ÿå稱 (ä¸æ˜¯å°è¡¨æ©Ÿé¡žåž‹æˆ–者型號)"
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
msgid "Setup Printer..."
msgstr "設定å°è¡¨æ©Ÿ..."
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
msgid ""
"Choose the printer model, PPD file, and command that is used to print to "
"this printer"
msgstr "é¸å–列å°æ™‚使用的å°è¡¨æ©Ÿåž‹è™Ÿã€PPD 檔åŠæŒ‡ä»¤"
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
msgid "New Printer..."
msgstr "新增å°è¡¨æ©Ÿ..."
-#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
msgid ""
"Define a new logical printer. This can be used to name a collection of "
"settings that you wish to remember for future use."
msgstr "定義新的虛擬å°è¡¨æ©Ÿã€‚這個「å°è¡¨æ©Ÿã€å…¶å¯¦æ˜¯ä»£è¡¨ä¸€çµ„設定,以便將來使用。"
-#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
msgid "Image Size"
msgstr "å½±åƒå°ºå¯¸"
-#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
msgid "Scaling:"
msgstr "縮放:"
-#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
msgid "Set the scale (size) of the image"
msgstr "指定影åƒçš„縮放比例 (尺寸)"
-#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
msgid "Scale by:"
msgstr ""
-#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
msgid ""
"Select whether scaling is measured as percent of available page size or "
"number of output dots per inch"
msgstr "指定放大縮å°å½±åƒæ™‚çš„å–®ä½ï¼Œæ˜¯é é¢å°ºå¯¸çš„百分比,還是æ¯è‹±å‹æœ‰å¤šå°‘點"
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
msgid "Percent"
msgstr "百分比"
-#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
msgid "Scale the print to the size of the page"
msgstr "指定列å°æ™‚çš„å½±åƒå°ºå¯¸ç‚ºé é¢å°ºå¯¸çš„æŸå€‹ç™¾åˆ†æ¯”"
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
msgid "PPI"
msgstr "PPI"
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
msgid "Scale the print to the number of dots per inch"
msgstr "列å°æ™‚,é€éŽæŒ‡å®šæ¯è‹±å‹æœ‰å¤šå°‘點來放大縮å°å½±åƒ"
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
msgid "Set the width of the print"
msgstr "指定列å°æ™‚çš„å½±åƒå¯¬åº¦"
-#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
msgid "Set the height of the print"
msgstr "指定列å°æ™‚çš„å½±åƒé«˜åº¦"
-#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
msgid ""
"Use Original\n"
"Image Size"
@@ -6817,64 +6823,64 @@ msgstr ""
"使用影åƒ\n"
"原來的尺寸"
-#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
msgid "Set the print size to the size of the image"
msgstr "將列å°æ™‚çš„å½±åƒå°ºå¯¸è¨­å®šç‚ºå½±åƒåŽŸä¾†çš„尺寸"
-#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
msgid "Print Color Adjust"
msgstr "列å°è‰²å½©èª¿æ•´"
-#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
msgid "Set Defaults"
msgstr ""
-#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
msgid "Close"
msgstr "關閉"
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
msgid "Image preview"
msgstr "å½±åƒé è¦½"
-#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
msgid "View Output Channels:"
msgstr ""
-#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
msgid "Output"
msgstr ""
-#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
msgid "Output Type:"
msgstr ""
-#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
msgid "Select the desired output type"
msgstr "指定輸出類型:"
-#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
msgid "Adjust Output..."
msgstr "調整輸出çµæžœ..."
-#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
msgid ""
"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
msgstr "調整色彩平衡ã€å…‰åº¦ã€åå·®ã€å½©åº¦åŠæ“¬è‰²çš„é‹ç®—æ–¹å¼"
-#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
msgid "Size Units:"
msgstr "尺寸單ä½ï¼š"
-#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
msgid " "
msgstr ""
-#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
msgid "Units:"
msgstr "å–®ä½ï¼š"
-#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
msgid "Select the base unit of measurement for printing"
msgstr "指定列å°æ™‚的基本長度單ä½"
@@ -6991,28 +6997,27 @@ msgstr ""
msgid "Extra 5"
msgstr ""
-#. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:189 src/cups/genppd.c:198
-msgid "Gutenprint"
-msgstr "Gutenprint"
-
-#: src/cups/genppd.c:890
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:888
msgid "English"
-msgstr ""
+msgstr "Chinese-TW"
-#: src/cups/genppd.c:892
+#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
+#: src/cups/genppd.c:890
msgid "ISOLatin1"
msgstr ""
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1465
msgid "No"
msgstr "å¦"
-#: src/cups/genppd.c:1469
+#: src/cups/genppd.c:1467
msgid "Yes"
msgstr "是"
-#: src/cups/genppd.c:1499
+#: src/cups/genppd.c:1497
msgid "Fine Adjustment"
msgstr ""
@@ -7217,19 +7222,23 @@ msgstr ""
msgid "Cannot read from %s: %s\n"
msgstr "無法由 %s 讀å–資料:%s\n"
-#: src/escputil/escputil.c:763 src/escputil/escputil.c:1355
-#: src/escputil/escputil.c:1469
+#: src/escputil/escputil.c:747
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:754
#, c-format
msgid "Cannot open %s read/write: %s\n"
msgstr ""
-#: src/escputil/escputil.c:781 src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
#, c-format
msgid "Cannot write to %s: %s\n"
msgstr "無法寫入 %s:%s\n"
-#: src/escputil/escputil.c:827 src/escputil/escputil.c:1373
-#: src/escputil/escputil.c:1507
+#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
+#: src/escputil/escputil.c:1511
#, c-format
msgid ""
"\n"
@@ -7238,7 +7247,7 @@ msgstr ""
"\n"
"無法寫入 %s:%s\n"
-#: src/escputil/escputil.c:869
+#: src/escputil/escputil.c:885
#, c-format
msgid ""
"\n"
@@ -7246,224 +7255,224 @@ msgid ""
"Please use -m to specify your printer model.\n"
msgstr ""
-#: src/escputil/escputil.c:967 src/escputil/escputil.c:973
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:990
-#: src/escputil/escputil.c:991 src/escputil/escputil.c:992
-#: src/escputil/escputil.c:993 src/escputil/escputil.c:994
-#: src/escputil/escputil.c:997 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:999 src/escputil/escputil.c:1000
-#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1241
+#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
+#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
+#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
+#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
msgid "Unknown"
msgstr "ä¸è©³"
-#: src/escputil/escputil.c:1011
+#: src/escputil/escputil.c:1027
#, c-format
msgid "Status: Error\n"
msgstr ""
-#: src/escputil/escputil.c:1014
+#: src/escputil/escputil.c:1030
#, c-format
msgid "Status: Self-Printing\n"
msgstr ""
-#: src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1033
#, c-format
msgid "Status: Busy\n"
msgstr ""
-#: src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1036
#, fuzzy, c-format
msgid "Status: Waiting\n"
msgstr "彩度"
-#: src/escputil/escputil.c:1023
+#: src/escputil/escputil.c:1039
#, c-format
msgid "Status: Idle\n"
msgstr ""
-#: src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1042
#, c-format
msgid "Status: Paused\n"
msgstr ""
-#: src/escputil/escputil.c:1029
+#: src/escputil/escputil.c:1045
#, c-format
msgid "Status: Cleaning\n"
msgstr ""
-#: src/escputil/escputil.c:1032
+#: src/escputil/escputil.c:1048
#, c-format
msgid "Status: Factory shipment\n"
msgstr ""
-#: src/escputil/escputil.c:1035
+#: src/escputil/escputil.c:1051
#, c-format
msgid "Status: Shutting down\n"
msgstr ""
-#: src/escputil/escputil.c:1038
+#: src/escputil/escputil.c:1054
#, c-format
msgid "Status: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1049
+#: src/escputil/escputil.c:1065
#, c-format
msgid "Error: Fatal Error\n"
msgstr ""
-#: src/escputil/escputil.c:1052
+#: src/escputil/escputil.c:1068
#, c-format
msgid "Error: Other interface is selected\n"
msgstr ""
-#: src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1071
#, c-format
msgid "Error: Cover Open\n"
msgstr ""
-#: src/escputil/escputil.c:1058
+#: src/escputil/escputil.c:1074
#, c-format
msgid "Error: Paper jam\n"
msgstr ""
-#: src/escputil/escputil.c:1061
+#: src/escputil/escputil.c:1077
#, c-format
msgid "Error: Ink out\n"
msgstr ""
-#: src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1080
#, c-format
msgid "Error: Paper out\n"
msgstr ""
-#: src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1083
#, c-format
msgid "Error: Wait return from the tear-off position\n"
msgstr ""
-#: src/escputil/escputil.c:1070
+#: src/escputil/escputil.c:1086
#, c-format
msgid "Error: Double feed error\n"
msgstr ""
-#: src/escputil/escputil.c:1073
+#: src/escputil/escputil.c:1089
#, c-format
msgid "Error: Unrecoverable cutter error\n"
msgstr ""
-#: src/escputil/escputil.c:1076
+#: src/escputil/escputil.c:1092
#, c-format
msgid "Error: Recoverable cutter jam\n"
msgstr ""
-#: src/escputil/escputil.c:1079
+#: src/escputil/escputil.c:1095
#, c-format
msgid "Error: CD Tray Out\n"
msgstr ""
-#: src/escputil/escputil.c:1082
+#: src/escputil/escputil.c:1098
#, c-format
msgid "Error: Card loading error\n"
msgstr ""
-#: src/escputil/escputil.c:1085
+#: src/escputil/escputil.c:1101
#, c-format
msgid "Error: Tray cover open\n"
msgstr ""
-#: src/escputil/escputil.c:1088
+#: src/escputil/escputil.c:1104
#, c-format
msgid "Error: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1099
+#: src/escputil/escputil.c:1115
#, c-format
msgid "Printing nozzle self-test\n"
msgstr ""
-#: src/escputil/escputil.c:1199 src/escputil/escputil.c:1229
+#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
#, c-format
msgid "Ink Levels:\n"
msgstr ""
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Ink color"
msgstr "墨水é¡è‰²"
-#: src/escputil/escputil.c:1200 src/escputil/escputil.c:1230
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Percent remaining"
msgstr ""
-#: src/escputil/escputil.c:1275 src/escputil/escputil.c:1278
-#: src/escputil/escputil.c:1281 src/escputil/escputil.c:1284
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
+#: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
+#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
#, c-format
msgid "Warning: Black Ink Low\n"
msgstr ""
-#: src/escputil/escputil.c:1293
+#: src/escputil/escputil.c:1309
#, c-format
msgid "Warning: Unknown (%d)\n"
msgstr ""
-#: src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1318
#, c-format
msgid "Job Name: "
msgstr ""
-#: src/escputil/escputil.c:1331
+#: src/escputil/escputil.c:1347
msgid "ink levels"
msgstr ""
-#: src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1350
msgid "status"
msgstr "狀態"
-#: src/escputil/escputil.c:1339
+#: src/escputil/escputil.c:1355
#, c-format
msgid "Obtaining %s requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1451
+#: src/escputil/escputil.c:1461
#, c-format
msgid "Obtaining extended ink information requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
+#: src/escputil/escputil.c:1646
msgid "Part number"
msgstr ""
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
+#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
+#: src/escputil/escputil.c:1647
msgid "Date"
msgstr "日期"
-#: src/escputil/escputil.c:1671
+#: src/escputil/escputil.c:1675
#, c-format
msgid "Printer identification requires using a raw device.\n"
msgstr ""
-#: src/escputil/escputil.c:1689
+#: src/escputil/escputil.c:1693
#, c-format
msgid "Cannot identify printer model.\n"
msgstr "無法識別å°è¡¨æ©Ÿåž‹è™Ÿã€‚\n"
-#: src/escputil/escputil.c:1709
+#: src/escputil/escputil.c:1713
#, c-format
msgid "Cleaning heads...\n"
msgstr ""
-#: src/escputil/escputil.c:1724
+#: src/escputil/escputil.c:1728
#, c-format
msgid "Running nozzle check, please ensure paper is in the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1728
+#: src/escputil/escputil.c:1732
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7502,7 +7511,7 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1763
+#: src/escputil/escputil.c:1767
#, c-format
msgid ""
"Please read these instructions very carefully before proceeding.\n"
@@ -7538,17 +7547,17 @@ msgid ""
"\n"
msgstr ""
-#: src/escputil/escputil.c:1807
+#: src/escputil/escputil.c:1811
#, c-format
msgid "Unable to send command to the printer, exiting.\n"
msgstr ""
-#: src/escputil/escputil.c:1821 src/escputil/escputil.c:1986
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
#, c-format
msgid "Exiting\n"
msgstr ""
-#: src/escputil/escputil.c:1824
+#: src/escputil/escputil.c:1828
#, c-format
msgid ""
"Please inspect the final output very carefully to ensure that your\n"
@@ -7560,38 +7569,38 @@ msgid ""
"What do you want to do (s, q, r)?\n"
msgstr ""
-#: src/escputil/escputil.c:1832 src/escputil/escputil.c:1841
-#: src/escputil/escputil.c:1856 src/escputil/escputil.c:1874
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
+#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
+#: src/escputil/escputil.c:1994
msgid "> "
msgstr "> "
-#: src/escputil/escputil.c:1839
+#: src/escputil/escputil.c:1843
#, c-format
msgid ""
"Please confirm by typing 'q' again that you wish to quit without saving:\n"
msgstr ""
-#: src/escputil/escputil.c:1846
+#: src/escputil/escputil.c:1850
#, c-format
msgid ""
"OK, your printer is aligned, but the alignment has not been saved.\n"
"If you wish to save the alignment, you must repeat this process.\n"
msgstr ""
-#: src/escputil/escputil.c:1853
+#: src/escputil/escputil.c:1857
#, c-format
msgid ""
"Please confirm by typing 'r' again that you wish to repeat the\n"
"alignment process:\n"
msgstr ""
-#: src/escputil/escputil.c:1861
+#: src/escputil/escputil.c:1865
#, c-format
msgid "Repeating the alignment process.\n"
msgstr ""
-#: src/escputil/escputil.c:1867
+#: src/escputil/escputil.c:1871
#, c-format
msgid ""
"This will permanently alter the configuration of your printer.\n"
@@ -7601,44 +7610,44 @@ msgid ""
"to your printer:\n"
msgstr ""
-#: src/escputil/escputil.c:1879
+#: src/escputil/escputil.c:1883
#, c-format
msgid "About to save settings..."
msgstr "準備儲存設定..."
-#: src/escputil/escputil.c:1885
+#: src/escputil/escputil.c:1889
#, c-format
msgid "failed!\n"
msgstr "失敗ï¼\n"
-#: src/escputil/escputil.c:1886
+#: src/escputil/escputil.c:1890
#, c-format
msgid ""
"Your settings were not saved successfully. You must repeat the\n"
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1890
+#: src/escputil/escputil.c:1894
#, c-format
msgid "succeeded!\n"
msgstr "æˆåŠŸï¼\n"
-#: src/escputil/escputil.c:1891
+#: src/escputil/escputil.c:1895
#, c-format
msgid "Your alignment settings have been saved to the printer.\n"
msgstr ""
-#: src/escputil/escputil.c:1896
+#: src/escputil/escputil.c:1900
#, c-format
msgid "Unrecognized command.\n"
msgstr ""
-#: src/escputil/escputil.c:1899
+#: src/escputil/escputil.c:1903
#, c-format
msgid "Final command was not confirmed.\n"
msgstr ""
-#: src/escputil/escputil.c:1904
+#: src/escputil/escputil.c:1908
#, c-format
msgid ""
"This procedure assumes that your printer is an Epson %s.\n"
@@ -7649,12 +7658,12 @@ msgid ""
"alignment procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1969 src/escputil/escputil.c:2000
-#: src/escputil/escputil.c:2043
+#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
+#: src/escputil/escputil.c:2047
msgid "Press enter to continue > "
msgstr "請按 enter 繼續 > "
-#: src/escputil/escputil.c:1976
+#: src/escputil/escputil.c:1980
#, c-format
msgid ""
"Please inspect the print, and choose the best pair of lines in each "
@@ -7662,42 +7671,42 @@ msgid ""
"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
msgstr ""
-#: src/escputil/escputil.c:1989
+#: src/escputil/escputil.c:1993
#, c-format
msgid "Pass #%d"
msgstr "第 %d 次"
-#: src/escputil/escputil.c:1997 src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
#, c-format
msgid "Please insert a fresh sheet of paper.\n"
msgstr "請放入白紙。\n"
-#: src/escputil/escputil.c:2016
+#: src/escputil/escputil.c:2020
#, c-format
msgid "Number out of range!\n"
msgstr "數字超出範åœä»¥å¤–ï¼\n"
-#: src/escputil/escputil.c:2021
+#: src/escputil/escputil.c:2025
#, c-format
msgid "I cannot understand what you typed!\n"
msgstr ""
-#: src/escputil/escputil.c:2027
+#: src/escputil/escputil.c:2031
#, c-format
msgid "The best pair of lines should be numbered between 1 and %d.\n"
msgstr ""
-#: src/escputil/escputil.c:2034
+#: src/escputil/escputil.c:2038
#, c-format
msgid "Attempting to set alignment..."
msgstr ""
-#: src/escputil/escputil.c:2037
+#: src/escputil/escputil.c:2041
#, c-format
msgid "succeeded.\n"
msgstr "æˆåŠŸã€‚\n"
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
#, c-format
msgid ""
"Please verify that the alignment is correct. After the alignment pattern\n"
@@ -7706,7 +7715,7 @@ msgid ""
"quality printing.\n"
msgstr ""
-#: src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:2088
#, c-format
msgid "Error in input\n"
msgstr ""
@@ -7715,7 +7724,7 @@ msgstr ""
msgid "Printing..."
msgstr "列å°ä¸­..."
-#: src/gimp/print.c:133 src/gimp2/print.c:137
+#: src/gimp/print.c:133
msgid "<Image>/File/Print..."
msgstr "<Image>/檔案/列å°..."
@@ -7731,112 +7740,115 @@ msgid ""
"not match the PPD file (%s).\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:190
+#: src/ghost/ijsgutenprint.c:191
#, c-format
msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:198
+#: src/ghost/ijsgutenprint.c:199
#, c-format
msgid "ERROR: ijsgutenprint: No row buffer\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:225 src/ghost/ijsgutenprint.c:245
+#: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
#, c-format
msgid ""
"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:497
+#: src/ghost/ijsgutenprint.c:498
#, c-format
msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
msgstr "錯誤:ijsgutenprint:å°è¡¨æ©Ÿå¿…須用 -sDeviceModel é¸é …指定\n"
-#: src/ghost/ijsgutenprint.c:499
+#: src/ghost/ijsgutenprint.c:500
#, c-format
msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
msgstr "錯誤:ijsgutenprint:å°è¡¨æ©Ÿ %s ä¸å±¬æ–¼å·²çŸ¥çš„型號\n"
-#: src/ghost/ijsgutenprint.c:655
+#: src/ghost/ijsgutenprint.c:656
#, c-format
msgid "ijsgutenprint: unknown DeviceModel %s\n"
msgstr "ijsgutenprint:DeviceModel %s ä¸æ˜Ž\n"
-#: src/ghost/ijsgutenprint.c:699
+#: src/ghost/ijsgutenprint.c:700
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:722
+#: src/ghost/ijsgutenprint.c:723
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:794
+#: src/ghost/ijsgutenprint.c:795
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:801
+#: src/ghost/ijsgutenprint.c:802
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:808
+#: src/ghost/ijsgutenprint.c:809
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:815
+#: src/ghost/ijsgutenprint.c:816
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:829
+#: src/ghost/ijsgutenprint.c:830
#, c-format
msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:840
+#: src/ghost/ijsgutenprint.c:841
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:866
+#: src/ghost/ijsgutenprint.c:867
#, c-format
msgid "ERROR: ijsgutenprint: bad key code %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1303
+#: src/ghost/ijsgutenprint.c:1308
#, c-format
msgid "ERROR: ijsgutenprint: image_init failed %d\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1314
+#: src/ghost/ijsgutenprint.c:1319
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1326
+#: src/ghost/ijsgutenprint.c:1331
#, c-format
msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
msgstr "錯誤:ijsgutenprint:無法開啟 %s:%s\n"
-#: src/ghost/ijsgutenprint.c:1338
+#: src/ghost/ijsgutenprint.c:1344
#, c-format
msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1508
+#: src/ghost/ijsgutenprint.c:1516
#, c-format
msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
msgstr ""
-#: src/ghost/ijsgutenprint.c:1526
+#: src/ghost/ijsgutenprint.c:1534
#, c-format
msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
msgstr ""
+#~ msgid "Gutenprint"
+#~ msgstr "Gutenprint"
+
#, fuzzy
#~ msgid "Canon BJC 4400 photo"
#~ msgstr "Canon BJC 4400 photo"
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 04e2df6..fcc946a 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -93,6 +93,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 1b615fc..96b0924 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -85,6 +85,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/Makefile.in b/src/Makefile.in
index 0de1821..fed1cfc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -92,6 +92,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index b0b8b9e..848dee5 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -163,6 +163,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/cups/cups-genppdconfig.in b/src/cups/cups-genppdconfig.in
index b59471e..26ae5e7 100644
--- a/src/cups/cups-genppdconfig.in
+++ b/src/cups/cups-genppdconfig.in
@@ -1,5 +1,5 @@
#! @PERL@ -w
-# $Id: cups-genppdconfig.in,v 1.12 2005/08/02 20:27:31 rleigh Exp $
+# $Id: cups-genppdconfig.in,v 1.13 2006/05/30 19:25:36 rleigh Exp $
# A user-friendly dialog-based wrapper for cups-genppd(8).
# Copyright (C) 2002 Roger Leigh <rleigh@debian.org>
#
@@ -36,12 +36,8 @@ sub create_ppds;
sub create_dir($);
sub dialog_read($$);
sub dialog_read_list (\%\@$$);
-sub perl_menu ($$$$@);
-sub perl_menu_read_list (\%\@$$);
-sub perl_menu_mult ($$@);
my $DIALOG = "@DIALOG@"; # version of dialog to call
-my $use_dialog = 0; # whether to use dialog
my $BACKTITLE = "Gutenprint CUPS PPD creation"; # dialog screen title
my %printers; # master list of printers
my %languages; # master list of languages
@@ -75,14 +71,8 @@ if ( $opt_u ) {
}
# Can we use dialog?
-if (-x $DIALOG) {
- $use_dialog = 1;
-} else {
- BEGIN { $Curses::OldCurses = 1; }
- use Curses;
- use perlmenu;
- perl_menu_defaults();
-}
+die "dialog(1) is not available, but is required for interactive use."
+ if ! -x $DIALOG;
while (my $option = main_menu()) { # Display main menu and run selection
if ($option eq "Help") {
@@ -218,21 +208,14 @@ END
[ "Create", "Create PPDs" ],
[ "Exit", "Exit the program" ]
);
- if ($use_dialog) {
- my $dialog_options;
- for my $i ( 0 .. $#menu_options) {
- for my $j ( 0 .. $#{$menu_options[$i]}) {
- $dialog_options .= "\"$menu_options[$i][$j]\" ";
- }
+ my $dialog_options;
+ for my $i ( 0 .. $#menu_options) {
+ for my $j ( 0 .. $#{$menu_options[$i]}) {
+ $dialog_options .= "\"$menu_options[$i][$j]\" ";
}
- while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) {
- chomp ($option);
- return $option;
- }
- } else {
- $option = perl_menu(1, "Main menu", "Choose an option.",
- "Current PPD directory: $chosen_location",
- @menu_options);
+ }
+ while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) {
+ chomp ($option);
return $option;
}
}
@@ -310,19 +293,7 @@ END
or die "can't open temporary help file";
print $HELPFILE "$help_text";
$HELPFILE->flush();
- if ($use_dialog) {
- dialog_read("Help", "--textbox $helpfilename 18 76");
- } else {
- &menu_init(0, "Help", 0);
- open(TEMP,$helpfilename);
- while (<TEMP>) {
- s/^(\t+)/' ' x length($1)/e;
- &expand($_) if /\t/;
- &menu_item($_,"", -1);
- }
- close(TEMP);
- &menu_display("Help viewer: (RET/u/t) exit (n/p) next/previous page (b) beginning (e) end");
- }
+ dialog_read("Help", "--textbox $helpfilename 18 76");
unlink0($HELPFILE, $helpfilename) or die "Error unlinking help file $helpfilename safely: $!";
close($HELPFILE) or die "can't close help file $helpfilename: $!";
return;
@@ -336,12 +307,7 @@ END
sub choose_printers {
my $title = "Printer selection";
my $options = "--checklist \"Choose the printer models you wish to use with CUPS.\" 18 54 11";
- if ($use_dialog) {
- dialog_read_list(%printers, @chosen_printers, $title, $options);
- } else {
- perl_menu_read_list(%printers, @chosen_printers, $title,
- "Choose the printer models you wish to use with CUPS.");
- }
+ dialog_read_list(%printers, @chosen_printers, $title, $options);
}
@@ -352,12 +318,7 @@ sub choose_printers {
sub choose_languages {
my $title = "Language selection";
my $options = "--checklist \"Choose the languages you wish to use with CUPS.\" 18 54 11";
- if ($use_dialog) {
- dialog_read_list(%languages, @chosen_languages, $title, $options);
- } else {
- perl_menu_read_list(%languages, @chosen_languages, $title,
- "Choose the languages you wish to use with CUPS.");
- }
+ dialog_read_list(%languages, @chosen_languages, $title, $options);
}
@@ -367,12 +328,8 @@ sub choose_languages {
#
sub choose_location {
my $location;
- if ($use_dialog) {
- $location = dialog_read("Location selection",
- "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location");
- } else {
- $location = &menu_getstr(5,12,"Directory:", 1, $chosen_location);
- }
+ $location = dialog_read("Location selection",
+ "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location");
if (!defined($location)) {
$location = "";
}
@@ -432,7 +389,7 @@ sub create_ppds {
} else {
$printers = "";
}
- if (! $silent && $use_dialog) {
+ if (! $silent) {
open DIALOG, "| $DIALOG --sleep 2 --backtitle \"$BACKTITLE\" --title \"Creating PPD files\" --guage \"Language: \nPPD files: \" 10 72 0"
or die "can't fork dialog: $!";
}
@@ -449,7 +406,7 @@ sub create_ppds {
if ($percent > 100) {
$percent = 100;
}
- if (! $silent && $use_dialog) {
+ if (! $silent) {
print DIALOG "$percent\n";
print DIALOG "XXX\nLanguage: $language\nPPD files: $count/$total\n\n$file\nXXX\n";
DIALOG->flush();
@@ -460,7 +417,7 @@ sub create_ppds {
}
close GENPPD or die "can't close cups-genppd pipe: $!";
}
- if (! $silent && $use_dialog) {
+ if (! $silent) {
print DIALOG "100\nXXX\nLanguage: \nPPD files: $total/$total\n\nCompleted\nXXX\n";
close DIALOG or die "can't close dialog pipe";
}
@@ -521,95 +478,3 @@ sub dialog_read_list (\%\@$$) {
@$list=split(/ /, $tmplist);
}
}
-
-
-# scalar
-# perl_menu($title)
-#
-sub perl_menu ($$$$@) {
- my ($top, $title, $question, $subtitle, @items) = @_;
- my $selection;
- &menu_init(1, "cups-genppdconfig", $top, $title, "$BACKTITLE\n-<$subtitle");
-
- for my $i ( 0 .. $#items) {
- &menu_item($items[$i][1], $items[$i][0]);
- }
-
- $selection = &menu_display($question);
- return $selection;
-}
-
-# scalar
-# perl_menu_mult($title, $question, @items)
-#
-sub perl_menu_mult ($$@) {
- my ($title, $question, @items) = @_;
- my $selection;
- &menu_init(1, "cups-genppdconfig", 0, $title, $BACKTITLE);
-
- for my $i ( 0 .. $#items) {
- &menu_item($items[$i][1], $items[$i][0], $items[$i][2]);
- }
-
- perl_menu_sel_defaults();
- $selection = &menu_display_mult($question);
- perl_menu_defaults();
- if ($selection eq "%UP%" or $selection eq "%NONE%") {
- return undef;
- }
- return $selection;
-}
-
-
-#
-# perl_menu_read_list(%masterlist
-# @chosenlist
-# $title
-# $question
-# - Construct list dialog, entries from %masterlist,
-# defaults from @chosenlist.
-#
-sub perl_menu_read_list (\%\@$$) {
- my $masterlist = $_[0];
- my $list = $_[1];
- my $title = $_[2];
- my $question = $_[3];
- my $tmplist;
- my @menulist = ();
- my $item;
- my $selected;
-# Make a list for use with perlmenu.
- foreach $item (sort keys %$masterlist) {
- $selected = 0;
- foreach (@$list) {
- if ($item eq $_) {
- $selected = 1;
- last;
- }
- }
- my $formatstring = sprintf "%-14s - %s", $item, $masterlist->{$item};
- push @menulist, [ $item, $formatstring, $selected ] ;
- }
- $tmplist = perl_menu_mult("$title", "RET=toggle selection (u/t) exit (n/p) next/previous page (b) beginning (e) end", @menulist);
- if (defined($tmplist)) {
- $tmplist =~ s/\"//g;
- @$list=split(/,/, $tmplist);
- }
-}
-
-
-#
-# perl_menu_defaults - set menu defaults
-#
-sub perl_menu_defaults {
- &menu_prefs(1, 0, 1, 0, "y", 0, 0);
-}
-
-
-#
-# perl_menu_sel_defaults - set menu defaults for multiple selections
-#
-sub perl_menu_sel_defaults {
- &menu_prefs(1, 0, 1, 0, "y", 1, 0);
-}
-
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index b0c3b0b..1a1a8f4 100644
--- a/src/cups/cups-genppdupdate.in
+++ b/src/cups/cups-genppdupdate.in
@@ -1,5 +1,5 @@
#! @PERL@ -w
-# $Id: cups-genppdupdate.in,v 1.24 2006/03/29 02:27:15 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.25 2006/05/22 20:25:51 rleigh Exp $
# Update CUPS PPDs for Gutenprint queues.
# Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
#
@@ -131,13 +131,15 @@ if (@ppdglob) {
chomp;
push @ppd_files, $_;
}
- open PPDFILES, '-|', 'egrep', '-i', '-L', 'Foomatic', @ppd_files or die "can't grep $ppdlist: $!";
- @ppd_files = ();
- while (<PPDFILES>) {
- chomp;
- push @ppd_files, $_;
+ if (@ppd_files) {
+ open PPDFILES, '-|', 'egrep', '-i', '-L', 'Foomatic', @ppd_files or die "can't grep $ppdlist: $!";
+ @ppd_files = ();
+ while (<PPDFILES>) {
+ chomp;
+ push @ppd_files, $_;
+ }
+ close PPDFILES or ($! == 0) or die "can't close grep pipe: $!";
}
- close PPDFILES or ($! == 0) or die "can't close grep pipe: $!";
}
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index f9011b4..6f77c62 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
/*
- * "$Id: genppd.c,v 1.117 2006/04/22 00:41:04 rlk Exp $"
+ * "$Id: genppd.c,v 1.118 2006/05/28 16:59:03 rlk Exp $"
*
* PPD file generation program for the CUPS drivers.
*
@@ -185,19 +185,18 @@ static void
print_group_open(FILE *fp, stp_parameter_class_t p_class,
stp_parameter_level_t p_level)
{
- /* TRANSLATORS: "Gutenprint" is a proper name, not a description */
- gzprintf(fp, "*OpenGroup: %s %s %s\n\n", _("Gutenprint"),
- _(parameter_class_names[p_class]),
- _(parameter_level_names[p_level]));
+ gzprintf(fp, "*OpenGroup: %s %s\n\n",
+ gettext(parameter_class_names[p_class]),
+ gettext(parameter_level_names[p_level]));
}
static void
print_group_close(FILE *fp, stp_parameter_class_t p_class,
stp_parameter_level_t p_level)
{
- gzprintf(fp, "*CloseGroup: %s %s %s\n\n", _("Gutenprint"),
- _(parameter_class_names[p_class]),
- _(parameter_level_names[p_level]));
+ gzprintf(fp, "*CloseGroup: %s %s\n\n",
+ gettext(parameter_class_names[p_class]),
+ gettext(parameter_level_names[p_level]));
}
/*
@@ -883,12 +882,11 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */
gzputs(fp, "*FormatVersion: \"4.3\"\n");
gzputs(fp, "*FileVersion: \"" VERSION "\"\n");
/* Specify language of PPD translation */
- /* Translators: Specify the language of the PPD translation.
+ /* TRANSLATORS: Specify the language of the PPD translation.
* Use the English name of your language here, e.g. "Swedish" instead of
- * "Svenska".
- */
+ * "Svenska". */
gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
- /* Specify PPD translation encoding e.g. ISOLatin1 */
+ /* TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 */
gzprintf(fp, "*LanguageEncoding: %s\n", _("ISOLatin1"));
/*
@@ -1285,7 +1283,7 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */
{
stp_clear_string_parameter(v, "Resolution");
has_quality_parameter = 1;
- gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", _(desc.text));
+ gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", gettext(desc.text));
gzputs(fp, "*OrderDependency: 5 AnySetup *StpQuality\n");
gzprintf(fp, "*DefaultStpQuality: %s\n", desc.deflt.str);
num_opts = stp_string_list_count(desc.bounds.str);
@@ -1430,7 +1428,7 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */
printed_open_group = 1;
}
gzprintf(fp, "*OpenUI *Stp%s/%s: PickOne\n",
- desc.name, _(desc.text));
+ desc.name, gettext(desc.text));
#if 0
gzprintf(fp, "*OrderDependency: %d AnySetup *Stp%s\n",
(100 + l + (j * param_count) +
@@ -1453,7 +1451,7 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */
{
opt = stp_string_list_param(desc.bounds.str, i);
gzprintf(fp, "*Stp%s %s/%s: \"\"\n",
- desc.name, opt->name, _(opt->text));
+ desc.name, opt->name, opt->text);
}
break;
case STP_PARAMETER_TYPE_BOOLEAN:
@@ -1496,7 +1494,7 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */
if (!simplified)
{
gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
- desc.name, _(desc.text), _("Fine Adjustment"));
+ desc.name, gettext(desc.text), _("Fine Adjustment"));
gzprintf(fp, "*DefaultStpFine%s:None\n", desc.name);
gzprintf(fp, "*StpFine%s None/0.000: \"\"\n", desc.name);
for (i = 0; i < 100; i += 5)
@@ -1594,5 +1592,5 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */
/*
- * End of "$Id: genppd.c,v 1.117 2006/04/22 00:41:04 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.118 2006/05/28 16:59:03 rlk Exp $".
*/
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index b3f74e8..626fcf9 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,5 +1,5 @@
/*
- * "$Id: rastertoprinter.c,v 1.99 2006/04/17 02:06:18 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.104 2006/07/04 02:19:14 rlk Exp $"
*
* Gutenprint based raster filter for the Common UNIX Printing System.
*
@@ -290,13 +290,14 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
if (!stp_string_list_is_present
(desc.bounds.str, stp_get_string_parameter(v, desc.name)))
{
+ const char *val = stp_get_string_parameter(v, desc.name);
fprintf(stderr, "DEBUG: Gutenprint clearing string %s (%s)\n",
- desc.name, stp_get_string_parameter(v, desc.name));
+ desc.name, val ? val : "(null)");
stp_clear_string_parameter(v, desc.name);
- if (desc.is_mandatory)
+ if (!desc.read_only && desc.is_mandatory && desc.is_active)
{
fprintf(stderr, "DEBUG: Gutenprint setting default string %s to %s\n",
- desc.name, desc.deflt.str);
+ desc.name, desc.deflt.str ? desc.deflt.str : "(null)");
stp_set_string_parameter(v, desc.name, desc.deflt.str);
if (strcmp(desc.name, "PageSize") == 0)
{
@@ -415,15 +416,23 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
set_string_parameter(v, "JobMode", "Job");
validate_options(v, cups);
stp_get_media_size(v, &(cups->width), &(cups->height));
+ stp_get_maximum_imageable_area(v, &tmp_left, &tmp_right,
+ &tmp_bottom, &tmp_top);
stp_get_imageable_area(v, &(cups->left), &(cups->right),
&(cups->bottom), &(cups->top));
fprintf(stderr, "DEBUG: Gutenprint limits w %d l %d r %d h %d t %d b %d\n",
cups->width, cups->left, cups->right, cups->height, cups->top, cups->bottom);
-
- tmp_left = cups->header.ImagingBoundingBox[0];
- tmp_top = cups->header.ImagingBoundingBox[1];
- tmp_right = cups->header.ImagingBoundingBox[2];
- tmp_bottom = cups->header.ImagingBoundingBox[3];
+ fprintf(stderr, "DEBUG: Gutenprint max limits l %d r %d t %d b %d\n",
+ tmp_left, tmp_right, tmp_top, tmp_bottom);
+
+ if (tmp_left < 0)
+ tmp_left = 0;
+ if (tmp_top < 0)
+ tmp_top = 0;
+ if (tmp_right > tmp_left + cups->width)
+ tmp_right = cups->width;
+ if (tmp_bottom > tmp_top + cups->height)
+ tmp_bottom = cups->height;
tmp_width = cups->right - cups->left;
tmp_height = cups->bottom - cups->top;
if (tmp_left < cups->left)
@@ -624,9 +633,12 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
break;
}
}
- else
- fprintf(stderr, "DEBUG: Gutenprint NOT setting %s to %s\n",
+ else if (val)
+ fprintf(stderr, "DEBUG: Gutenprint NOT setting %s to '%s'\n",
desc.name, val);
+ else
+ fprintf(stderr, "DEBUG: Gutenprint NOT setting %s to (null)\n",
+ desc.name);
}
stp_parameter_description_destroy(&desc);
stp_free(ppd_option_name);
@@ -1189,5 +1201,5 @@ Image_width(stp_image_t *image) /* I - Image */
/*
- * End of "$Id: rastertoprinter.c,v 1.99 2006/04/17 02:06:18 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.104 2006/07/04 02:19:14 rlk Exp $".
*/
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 8158d09..b07898b 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -104,6 +104,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 0aa46db..ffaacec 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escputil.c,v 1.85 2006/04/16 01:00:51 rlk Exp $"
+ * "$Id: escputil.c,v 1.87 2006/05/31 08:31:59 rleigh Exp $"
*
* Printer maintenance utility for EPSON Stylus (R) printers
*
@@ -245,7 +245,7 @@ print_models(void)
if (strcmp(stp_printer_get_family(printer), "escp2") == 0)
{
printf("%-15s %s\n", stp_printer_get_driver(printer),
- _(stp_printer_get_long_name(printer)));
+ gettext(stp_printer_get_long_name(printer)));
}
}
}
@@ -253,7 +253,7 @@ print_models(void)
void
do_help(int code)
{
- printf("%s", _(help_msg));
+ printf("%s", gettext(help_msg));
exit(code);
}
@@ -354,7 +354,7 @@ main(int argc, char **argv)
do_help(0);
break;
case 'l':
- printf("%s\n", _(license));
+ printf("%s\n", gettext(license));
exit(0);
case 'M':
print_models();
@@ -377,7 +377,7 @@ main(int argc, char **argv)
do_help(1);
}
default:
- printf("%s\n", _(banner));
+ printf("%s\n", gettext(banner));
fprintf(stderr, _("Unknown option %c\n"), c);
do_help(1);
}
@@ -424,7 +424,7 @@ main(int argc, char **argv)
exit(0);
}
-void
+static void
print_debug_data(const char *buf, size_t count)
{
int i;
@@ -737,6 +737,28 @@ alarm_handler(int sig)
alarm_interrupt = 1;
}
+static int
+open_raw_device(void)
+{
+ int fd;
+
+ if (!raw_device)
+ {
+ fprintf(stderr, _("Please specify a raw device\n"));
+ exit(1);
+ }
+
+ fd = open(raw_device, O_RDWR, 0666);
+ if (fd == -1)
+ {
+ fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
+ strerror(errno));
+ exit(1);
+ }
+
+ return fd;
+}
+
static const stp_printer_t *
initialize_printer(int quiet, int fail_if_not_found)
{
@@ -757,13 +779,7 @@ initialize_printer(int quiet, int fail_if_not_found)
quiet = 0;
- fd = open(raw_device, O_RDWR, 0666);
- if (fd == -1)
- {
- fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
- strerror(errno));
- exit(1);
- }
+ fd = open_raw_device();
if (!printer_model)
{
@@ -1151,7 +1167,7 @@ print_old_ink_levels(const char *ind, stp_string_list_t *color_list)
return;
val = (get_digit(ind[0]) << 4) + get_digit(ind[1]);
printf("%18s %20d\n",
- _(stp_string_list_param(color_list, i)->text), val);
+ gettext(stp_string_list_param(color_list, i)->text), val);
ind += 2;
}
}
@@ -1232,10 +1248,10 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
{
if (ind[0] < color_count)
printf("%18s %20d\n",
- _(colors_new[(int) ind[0]]), ind[2]);
+ gettext(colors_new[(int) ind[0]]), ind[2]);
else if (ind[j] == 0x40 && ind[1] < aux_color_count)
printf("%18s %20d\n",
- _(aux_colors[(int) ind[1]]), ind[2]);
+ gettext(aux_colors[(int) ind[1]]), ind[2]);
else
printf("%8s 0x%2x 0x%2x %20d\n",
_("Unknown"), (unsigned char) ind[0],
@@ -1337,25 +1353,19 @@ do_status_command_internal(status_cmd_t cmd)
if (!raw_device)
{
fprintf(stderr,_("Obtaining %s requires using a raw device.\n"),
- _(cmd_name));
+ gettext(cmd_name));
exit(1);
}
STP_DEBUG(fprintf(stderr, "%s...\n", cmd_name));
printer = get_printer(1, 0);
if (!found_unknown_old_printer)
- STP_DEBUG(fprintf(stderr, "%s found %s%s\n", _(cmd_name),
+ STP_DEBUG(fprintf(stderr, "%s found %s%s\n", gettext(cmd_name),
printer ? stp_printer_get_long_name(printer) :
printer_model,
printer ? "" : "(Unknown model)"));
- fd = open(raw_device, O_RDWR, 0666);
- if (fd == -1)
- {
- fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
- strerror(errno));
- exit(1);
- }
+ fd = open_raw_device();
if (isnew)
{
@@ -1463,13 +1473,7 @@ do_extended_ink_info(int extended_output)
"Warning! Printer %s is not known; information may be incomplete or incorrect\n",
printer_model);
- fd = open(raw_device, O_RDWR, 0666);
- if (fd == -1)
- {
- fprintf(stderr, _("Cannot open %s read/write: %s\n"), raw_device,
- strerror(errno));
- exit(1);
- }
+ fd = open_raw_device();
if (isnew)
{
@@ -1598,11 +1602,11 @@ do_extended_ink_info(int extended_output)
_("Ink color"), _("Percent remaining"), _("Part number"),
_("Date"));
printf("%18s %20d T0%03d %2d%02d-%02d\n",
- _(stp_string_list_param(color_list, 0)->text),
+ gettext(stp_string_list_param(color_list, 0)->text),
iv[0], id, (year > 80 ? 19 : 20), year, month);
for (j = 1; j < 6; j++)
printf("%18s %20d T0%03d %2d%02d-%02d\n",
- _(stp_string_list_param(color_list, j)->text),
+ gettext(stp_string_list_param(color_list, j)->text),
iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
break;
}
@@ -1622,11 +1626,11 @@ do_extended_ink_info(int extended_output)
_("Ink color"), _("Percent remaining"), _("Part number"),
_("Date"));
printf("%18s %20d T0%03d %2d%02d-%02d\n",
- _(stp_string_list_param(color_list, 0)->text),
+ gettext(stp_string_list_param(color_list, 0)->text),
iv[0], id, (year > 80 ? 19 : 20), year, month);
for (j = 1; j < 4; j++)
printf("%18s %20d T0%03d %2d%02d-%02d\n",
- _(stp_string_list_param(color_list, j)->text),
+ gettext(stp_string_list_param(color_list, j)->text),
iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
break;
}
@@ -1642,7 +1646,7 @@ do_extended_ink_info(int extended_output)
_("Ink color"), _("Percent remaining"), _("Part number"),
_("Date"));
printf("%18s %20d T0%03d %2d%02d-%02d\n",
- _(stp_string_list_param(color_list, i)->text),
+ gettext(stp_string_list_param(color_list, i)->text),
val, id, (year > 80 ? 19 : 20), year, month);
}
else
@@ -1679,7 +1683,7 @@ do_identify(void)
if (print_short_name)
printf("%s\n", stp_printer_get_driver(printer));
else
- printf("%s\n", _(stp_printer_get_long_name(printer)));
+ printf("%s\n", gettext(stp_printer_get_long_name(printer)));
exit(0);
}
else if (printer_model)
@@ -1795,9 +1799,9 @@ static void
do_align_help(int passes, int choices)
{
if (passes > 1)
- printf(_(new_align_help), passes, 1, choices, (choices + 1) / 2, choices);
+ printf(gettext(new_align_help), passes, 1, choices, (choices + 1) / 2, choices);
else
- printf(_(old_align_help), 1, choices, (choices + 1) / 2, choices);
+ printf(gettext(old_align_help), 1, choices, (choices + 1) / 2, choices);
fflush(stdout);
}
@@ -1965,7 +1969,7 @@ do_align(void)
do
{
do_align_help(alignment_passes, alignment_choices);
- printf(_(printer_msg), _(printer_name));
+ printf(gettext(printer_msg), gettext(printer_name));
inbuf = do_get_input(_("Press enter to continue > "));
top:
initialize_print_cmd(1);
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index c285af0..f90f9d9 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.49 2006/05/06 01:11:38 rlk Exp $
+## $Id: Makefile.am,v 1.50 2006/07/08 17:40:22 rlk Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -33,6 +33,10 @@ endif
STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+LC_C_ENV= LC_ALL=C LANG=C LANGUAGE=C
+
+FOOMATIC_GENERATOR= $(STP_ENV) $(LC_C_ENV) ./foomatic-generator
+
## Programs
if BUILD_FOOMATIC
@@ -93,8 +97,8 @@ foomatic-data: foomatic-stamp
foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
-$(RM) -r foomatic-db
- $(STP_ENV) ./foomatic-generator -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
- $(STP_ENV) ./foomatic-generator -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+ $(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+ $(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
touch foomatic-stamp
dist-hook:
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 8f800ae..897cfb3 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -122,6 +122,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
@@ -347,6 +349,8 @@ DISTDIRS = foomatic-templates-ijs
LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS)
@BUILD_FOOMATIC_3_TRUE@BUILD_FOOMATIC = 1
STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+LC_C_ENV = LC_ALL=C LANG=C LANGUAGE=C
+FOOMATIC_GENERATOR = $(STP_ENV) $(LC_C_ENV) ./foomatic-generator
printer_options_SOURCES = printer_options.c
printer_options_LDADD = $(GUTENPRINT_LIBS)
printer_margins_SOURCES = printer_margins.c
@@ -660,8 +664,8 @@ foomatic-data: foomatic-stamp
foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
-$(RM) -r foomatic-db
- $(STP_ENV) ./foomatic-generator -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
- $(STP_ENV) ./foomatic-generator -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+ $(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
+ $(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
touch foomatic-stamp
dist-hook:
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index fdb2a37..02a863c 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -1,4 +1,5 @@
#!@PERL@
+# -*- perl -*-
# Get command line options
use Getopt::Long;
@@ -424,13 +425,15 @@ for $drivertype (@drivertypes) {
unless -d 'foomatic-db/$drvname/driver';
my $order = 1000;
+ my %numoptionorders;
# opendir TDIR, "$templatedir-$drivertype" or
# die "Cannot open templates directory: $!\n";
- for $fooopt (sort (keys(%ev_choices), @floatnumopts_list,
- @dimensionnumopts_list,
- @intnumopts_list), "PrintoutMode", "Model",
+ for $fooopt (sort(keys(%ev_choices)),
+ sort(@floatnumopts_list, @dimensionnumopts_list,
+ @intnumopts_list),
+ "PrintoutMode", "Model",
"RenderResolution", "gutenprint") {
# The "PrintoutMode" option is only supported by Foomatic 2.9.x or
@@ -564,8 +567,21 @@ for $drivertype (@drivertypes) {
$template =~ s!\@\@LOWERCASESHORTNAME\@\@!$lowercaseshortname!g;
$template =~ s!\@\@LONGNAME\@\@!$longnames{$shortname}!g;
$template =~ s!\@\@SHORTNAME\@\@!$shortopt!g;
- $template =~ s!\@\@ORDER\@\@!$order!g;
- #$order += 10;
+ if ($shortname =~ /^STP_Enable(.*)$/) {
+ $numoptionorders{$1} = $order;
+ $template =~ s!\@\@ORDER\@\@!$order!g;
+ $order += 10;
+ } else {
+ $shortname =~ /^STP_(.*)$/;
+ my $basename = $1;
+ if (my $enableorder = $numoptionorders{$basename}) {
+ $enableorder ++;
+ $template =~ s!\@\@ORDER\@\@!$enableorder!g;
+ } else {
+ $template =~ s!\@\@ORDER\@\@!$order!g;
+ $order += 10;
+ }
+ }
$template =~ s!\@\@SPOT\@\@!B!g;
$template =~ s!\@\@PROTO\@\@!$subopt=\%s,!g;
}
diff --git a/src/foomatic/printer_options.c b/src/foomatic/printer_options.c
index 6c1a9ba..d3a3b42 100644
--- a/src/foomatic/printer_options.c
+++ b/src/foomatic/printer_options.c
@@ -1,5 +1,5 @@
/*
- * "$Id: printer_options.c,v 1.49 2006/03/13 13:29:02 rlk Exp $"
+ * "$Id: printer_options.c,v 1.50 2006/05/28 16:59:03 rlk Exp $"
*
* Dump the per-printer options for Grant Taylor's *-omatic database
*
@@ -191,11 +191,11 @@ main(int argc, char **argv)
printf("$stp_float_values{'%s'}{'DEFVAL'}{'STP_%s'} = %.3f;\n",
driver, desc.name, desc.deflt.dbl);
/* printf("$stp_float_values{'%s'}{'LONG_NAME'}{'STP_%s'} = '%s';\n",
- driver, desc.name, _(desc.text)); */
+ driver, desc.name, gettext(desc.text)); */
printf("$stp_float_values{'%s'}{'CATEGORY'}{'STP_%s'} = '%s';\n",
- driver, desc.name, _(desc.category));
+ driver, desc.name, gettext(desc.category));
printf("$stp_float_values{'%s'}{'HELP'}{'STP_%s'} = q(%s);\n",
- driver, desc.name, (desc.help ? _(desc.help) : "''"));
+ driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
printf("$stp_float_values{'%s'}{'MANDATORY'}{'STP_%s'} = q(%d);\n",
driver, desc.name, desc.is_mandatory);
}
@@ -212,11 +212,11 @@ main(int argc, char **argv)
printf("$stp_int_values{'%s'}{'DEFVAL'}{'STP_%s'} = %d;\n",
driver, desc.name, desc.deflt.integer);
/* printf("$stp_int_values{'%s'}{'LONG_NAME'}{'STP_%s'} = '%s';\n",
- driver, desc.name, _(desc.text)); */
+ driver, desc.name, gettext(desc.text)); */
printf("$stp_int_values{'%s'}{'CATEGORY'}{'STP_%s'} = '%s';\n",
- driver, desc.name, _(desc.category));
+ driver, desc.name, gettext(desc.category));
printf("$stp_int_values{'%s'}{'HELP'}{'STP_%s'} = q(%s);\n",
- driver, desc.name, (desc.help ? _(desc.help) : "''"));
+ driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
printf("$stp_int_values{'%s'}{'MANDATORY'}{'STP_%s'} = q(%d);\n",
driver, desc.name, desc.is_mandatory);
}
@@ -233,11 +233,11 @@ main(int argc, char **argv)
printf("$stp_dimension_values{'%s'}{'DEFVAL'}{'STP_%s'} = %d;\n",
driver, desc.name, desc.deflt.dimension);
/* printf("$stp_dimension_values{'%s'}{'LONG_NAME'}{'STP_%s'} = '%s';\n",
- driver, desc.name, _(desc.text)); */
+ driver, desc.name, gettext(desc.text)); */
printf("$stp_dimension_values{'%s'}{'CATEGORY'}{'STP_%s'} = '%s';\n",
- driver, desc.name, _(desc.category));
+ driver, desc.name, gettext(desc.category));
printf("$stp_dimension_values{'%s'}{'HELP'}{'STP_%s'} = q(%s);\n",
- driver, desc.name, (desc.help ? _(desc.help) : "''"));
+ driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
printf("$stp_dimension_values{'%s'}{'MANDATORY'}{'STP_%s'} = q(%d);\n",
driver, desc.name, desc.is_mandatory);
}
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index c8b76b5..4d1902e 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -109,6 +109,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index 80167eb..58b63ff 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
/*
- * $Id: ijsgutenprint.c,v 1.14 2006/04/19 03:24:26 rlk Exp $
+ * $Id: ijsgutenprint.c,v 1.18 2006/07/04 02:19:15 rlk Exp $
*
* IJS server for Gutenprint.
*
@@ -109,6 +109,7 @@ static int ppd_mode = 0; /* Use PPD-style margins */
static stp_string_list_t *option_remap_list = NULL;
static int print_messages_as_errors = 0;
+static double page_bytes_printed = 0;
static double total_bytes_printed = 0;
static char *
@@ -134,7 +135,7 @@ image_init(IMAGE *img, IjsPageHeader *ph)
if (img->row_buf)
stp_free(img->row_buf);
img->row_buf = (char *)stp_malloc(img->row_width);
- STP_DEBUG(fprintf(stderr, "stp_image_init\n"));
+ STP_DEBUG(fprintf(stderr, "ijsgutenprint: image_init\n"));
STP_DEBUG(fprintf(stderr,
"ijsgutenprint: ph width %d height %d bps %d n_chan %d xres %f yres %f\n",
ph->width, ph->height, ph->bps, ph->n_chan, ph->xres,
@@ -743,7 +744,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
ppd_mode = 1;
if (strcmp(vbuf, version_id) != 0)
{
- fprintf(stderr, _(version_mismatch),
+ fprintf(stderr, gettext(version_mismatch),
version_id, vbuf, version_id, vbuf);
version_is_ok = 0;
gutenprint_ppd_version = c_strdup(vbuf);
@@ -895,6 +896,7 @@ gutenprint_errfunc(void *file, const char *buf, size_t bytes)
static void
gutenprint_outfunc(void *data, const char *buffer, size_t bytes)
{
+ page_bytes_printed += bytes;
total_bytes_printed += bytes;
if ((data != NULL) && (buffer != NULL) && (bytes != 0))
fwrite(buffer, 1, bytes, (FILE *)data);
@@ -1051,6 +1053,8 @@ stp_dbg(const char *msg, const stp_vars_t *v)
stp_parameter_list_t params = stp_get_parameter_list(v);
int count = stp_parameter_list_count(params);
int i;
+ if (!stp_debug && !getenv("STP_DEBUG"))
+ return;
fprintf(stderr, "DEBUG: %s\n", msg);
fprintf(stderr, "DEBUG: ijsgutenprint: Settings: Model %s\n", stp_get_driver(v));
for (i = 0; i < count; i++)
@@ -1075,8 +1079,9 @@ stp_dbg(const char *msg, const stp_vars_t *v)
break;
case STP_PARAMETER_TYPE_BOOLEAN:
if (stp_check_boolean_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
- fprintf(stderr, "DEBUG: ijsgutenprint: Settings: %s %d\n",
- p->name, stp_get_boolean_parameter(v, p->name));
+ fprintf(stderr, "DEBUG: ijsgutenprint: Settings: %s %s\n",
+ p->name,
+ stp_get_boolean_parameter(v, p->name) ? "true" : "false");
break;
case STP_PARAMETER_TYPE_STRING_LIST:
if (stp_check_string_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
@@ -1173,12 +1178,12 @@ validate_options(stp_image_t *image)
(desc.bounds.str, stp_get_string_parameter(v, desc.name)))
{
STP_DEBUG(fprintf(stderr, "ijsgutenprint: clearing string %s (%s)\n",
- desc.name, stp_get_string_parameter(v, desc.name)));
+ desc.name, safe_get_string_parameter(v, desc.name)));
stp_clear_string_parameter(v, desc.name);
- if (desc.is_mandatory)
+ if (!desc.read_only && desc.is_mandatory && desc.is_active)
{
STP_DEBUG(fprintf(stderr, "ijsgutenprint: setting default string %s to %s\n",
- desc.name, desc.deflt.str));
+ desc.name, desc.deflt.str ? desc.deflt.str : "(null)"));
stp_set_string_parameter(v, desc.name, desc.deflt.str);
if (strcmp(desc.name, "PageSize") == 0)
{
@@ -1286,7 +1291,7 @@ main (int argc, char **argv)
ijs_server_install_get_cb (img.ctx, gutenprint_get_cb, &img);
ijs_server_install_set_cb(img.ctx, gutenprint_set_cb, &img);
- STP_DEBUG(stp_dbg("ijsgutenprint: about to start\n", img.v));
+ stp_dbg("ijsgutenprint: about to start\n", img.v);
STP_DEBUG(fprintf(stderr, "ijsgutenprint: About to get page header\n"));
status = ijs_server_get_page_header(img.ctx, &ph);
@@ -1295,7 +1300,7 @@ main (int argc, char **argv)
stp_vars_t *old_v = NULL;
STP_DEBUG(fprintf(stderr, "ijsgutenprint: got page header, %d x %d\n",
ph.width, ph.height));
- STP_DEBUG(stp_dbg("ijsgutenprint: have page header\n", img.v));
+ stp_dbg("ijsgutenprint: have page header\n", img.v);
status = image_init(&img, &ph);
if (status)
@@ -1331,18 +1336,18 @@ main (int argc, char **argv)
/* Printer data to file */
stp_set_outdata(img.v, f);
+ }
- printer = stp_get_printer(img.v);
- if (printer == NULL)
- {
- fprintf(stderr, _("ERROR: ijsgutenprint: Unknown printer %s\n"),
- stp_get_driver(img.v));
- status = -1;
- break;
- }
- purge_unused_float_parameters(img.v);
- stp_merge_printvars(img.v, stp_printer_get_defaults(printer));
+ printer = stp_get_printer(img.v);
+ if (printer == NULL)
+ {
+ fprintf(stderr, _("ERROR: ijsgutenprint: Unknown printer %s\n"),
+ stp_get_driver(img.v));
+ status = -1;
+ break;
}
+ purge_unused_float_parameters(img.v);
+ stp_merge_printvars(img.v, stp_printer_get_defaults(printer));
img.total_bytes = (double) ((ph.n_chan * ph.bps * ph.width + 7) >> 3)
@@ -1483,7 +1488,7 @@ main (int argc, char **argv)
STP_DEBUG(fprintf(stderr, "ijsgutenprint: Duplex=%s\n", safe_get_string_parameter(img.v, "Duplex")));
validate_options(&si);
- STP_DEBUG(stp_dbg("ijsgutenprint: about to print", img.v));
+ stp_dbg("ijsgutenprint: about to print", img.v);
STP_DEBUG(fprintf(stderr, "ijsgutenprint: w %d h %d l %d t %d\n",
stp_get_width(img.v), stp_get_height(img.v),
stp_get_left(img.v), stp_get_top(img.v)));
@@ -1491,16 +1496,19 @@ main (int argc, char **argv)
print_messages_as_errors = 1;
if (!version_is_ok)
{
- fprintf(stderr, _(version_mismatch), version_id,
+ fprintf(stderr, gettext(version_mismatch), version_id,
gutenprint_ppd_version, version_id, gutenprint_ppd_version);
status = IJS_ERANGE;
break;
}
else if (stp_verify(img.v))
{
+ page_bytes_printed = 0;
if (page == 0)
stp_start_job(img.v, &si);
stp_print(img.v, &si);
+ STP_DEBUG(fprintf(stderr, "ijsgutenprint: printed page %d, %.0f bytes\n",
+ page, page_bytes_printed));
old_v = stp_vars_create_copy(img.v);
}
else
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index ff81bf0..6038199 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -104,6 +104,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/gimp2/Makefile.am b/src/gimp2/Makefile.am
index d470181..489e6aa 100644
--- a/src/gimp2/Makefile.am
+++ b/src/gimp2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6 2005/11/21 11:16:23 rleigh Exp $
+## $Id: Makefile.am,v 1.7 2006/07/04 02:57:58 rlk Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -24,25 +24,36 @@ include $(top_srcdir)/scripts/global.mk
## Variables
-LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP2_CFLAGS)
## Programs
if BUILD_GIMP2
+if BUILD_GIMP2_AS_GUTENPRINT
+gimp2_plug_in_PROGRAMS = gutenprint
+else
gimp2_plug_in_PROGRAMS = print
endif
+endif
-print_SOURCES = \
+LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP2_CFLAGS)
+
+COMMON_PRINT_SOURCES = \
print-image-gimp.c \
print-intl.h \
print.c \
print_gimp.h
+
+print_SOURCES = $(COMMON_PRINT_SOURCES) print-print.c
print_LDADD = $(GIMP2_LIBS) $(GUTENPRINTUI2_LIBS)
print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS)
+gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c
+gutenprint_LDADD = $(print_LDADD)
+gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)
## Clean
MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES = print gutenprint
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index 5c4723e..d051d04 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -43,7 +43,8 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/scripts/global.mk
-@BUILD_GIMP2_TRUE@gimp2_plug_in_PROGRAMS = print$(EXEEXT)
+@BUILD_GIMP2_AS_GUTENPRINT_FALSE@@BUILD_GIMP2_TRUE@gimp2_plug_in_PROGRAMS = print$(EXEEXT)
+@BUILD_GIMP2_AS_GUTENPRINT_TRUE@@BUILD_GIMP2_TRUE@gimp2_plug_in_PROGRAMS = gutenprint$(EXEEXT)
subdir = src/gimp2
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -61,11 +62,15 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(gimp2_plug_indir)"
gimp2_plug_inPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(gimp2_plug_in_PROGRAMS)
-am_print_OBJECTS = print-image-gimp.$(OBJEXT) print.$(OBJEXT)
-print_OBJECTS = $(am_print_OBJECTS)
+am__objects_1 = print-image-gimp.$(OBJEXT) print.$(OBJEXT)
+am_gutenprint_OBJECTS = $(am__objects_1) print-gutenprint.$(OBJEXT)
+gutenprint_OBJECTS = $(am_gutenprint_OBJECTS)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = \
$(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+am_print_OBJECTS = $(am__objects_1) print-print.$(OBJEXT)
+print_OBJECTS = $(am_print_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -77,8 +82,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(print_SOURCES)
-DIST_SOURCES = $(print_SOURCES)
+SOURCES = $(gutenprint_SOURCES) $(print_SOURCES)
+DIST_SOURCES = $(gutenprint_SOURCES) $(print_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -104,6 +109,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
@@ -326,15 +333,20 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP2_CFLAGS)
-print_SOURCES = \
+COMMON_PRINT_SOURCES = \
print-image-gimp.c \
print-intl.h \
print.c \
print_gimp.h
+print_SOURCES = $(COMMON_PRINT_SOURCES) print-print.c
print_LDADD = $(GIMP2_LIBS) $(GUTENPRINTUI2_LIBS)
print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS)
+gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c
+gutenprint_LDADD = $(print_LDADD)
+gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)
MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES = print gutenprint
all: all-am
.SUFFIXES:
@@ -396,6 +408,9 @@ clean-gimp2_plug_inPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
+gutenprint$(EXEEXT): $(gutenprint_OBJECTS) $(gutenprint_DEPENDENCIES)
+ @rm -f gutenprint$(EXEEXT)
+ $(LINK) $(gutenprint_LDFLAGS) $(gutenprint_OBJECTS) $(gutenprint_LDADD) $(LIBS)
print$(EXEEXT): $(print_OBJECTS) $(print_DEPENDENCIES)
@rm -f print$(EXEEXT)
$(LINK) $(print_LDFLAGS) $(print_OBJECTS) $(print_LDADD) $(LIBS)
@@ -525,6 +540,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff --git a/src/gimp2/print-gutenprint.c b/src/gimp2/print-gutenprint.c
new file mode 100644
index 0000000..1fab376
--- /dev/null
+++ b/src/gimp2/print-gutenprint.c
@@ -0,0 +1,62 @@
+/*
+ * "$Id: print-gutenprint.c,v 1.1 2006/07/04 02:57:59 rlk Exp $"
+ *
+ * Print plug-in for the GIMP.
+ *
+ * Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
+ * Robert Krawitz (rlk@alum.mit.edu)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gutenprintui2/gutenprintui.h>
+#include "print_gimp.h"
+
+#include "print-intl.h"
+
+void
+do_gimp_install_procedure(const char *blurb, const char *help,
+ const char *auth, const char *copy,
+ const char *types, int n_args,
+ GimpParamDef *args)
+{
+ gimp_install_procedure ((BAD_CONST_CHAR) "file_print_gutenprint",
+ (BAD_CONST_CHAR) blurb,
+ (BAD_CONST_CHAR) help,
+ (BAD_CONST_CHAR) auth,
+ (BAD_CONST_CHAR) copy,
+ (BAD_CONST_CHAR) VERSION " - " RELEASE_DATE,
+ /* Do not translate the prefix "<Image>" */
+#if (GIMP_MAJOR_VERSION > 2 || GIMP_MINOR_VERSION >= 2)
+ (BAD_CONST_CHAR) N_("_Print with Gutenprint..."),
+#else
+ (BAD_CONST_CHAR) N_("<Image>/File/Print with Gutenprint..."),
+#endif
+ (BAD_CONST_CHAR) types,
+ GIMP_PLUGIN,
+ n_args, 0,
+ args, NULL);
+#if (GIMP_MAJOR_VERSION > 2 || GIMP_MINOR_VERSION >= 2)
+ gimp_plugin_menu_register ((BAD_CONST_CHAR) "file_print_gutenprint",
+ (BAD_CONST_CHAR) "<Image>/File/Send");
+ gimp_plugin_icon_register ((BAD_CONST_CHAR) "file_print_gutenprint",
+ GIMP_ICON_TYPE_STOCK_ID, GTK_STOCK_PRINT);
+#endif
+}
+
diff --git a/src/gimp2/print-print.c b/src/gimp2/print-print.c
new file mode 100644
index 0000000..5895264
--- /dev/null
+++ b/src/gimp2/print-print.c
@@ -0,0 +1,52 @@
+/*
+ * "$Id: print-print.c,v 1.1 2006/07/04 02:57:59 rlk Exp $"
+ *
+ * Print plug-in for the GIMP.
+ *
+ * Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
+ * Robert Krawitz (rlk@alum.mit.edu)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gutenprintui2/gutenprintui.h>
+#include "print_gimp.h"
+
+#include "print-intl.h"
+
+void
+do_gimp_install_procedure(const char *blurb, const char *help,
+ const char *auth, const char *copy,
+ const char *types, int n_args,
+ GimpParamDef *args)
+{
+ gimp_install_procedure ((BAD_CONST_CHAR) "file_print_gimp",
+ (BAD_CONST_CHAR) blurb,
+ (BAD_CONST_CHAR) help,
+ (BAD_CONST_CHAR) auth,
+ (BAD_CONST_CHAR) copy,
+ (BAD_CONST_CHAR) VERSION " - " RELEASE_DATE,
+ /* Do not translate the prefix "<Image>" */
+ (BAD_CONST_CHAR) N_("<Image>/File/Print..."),
+ (BAD_CONST_CHAR) types,
+ GIMP_PLUGIN,
+ n_args, 0,
+ args, NULL);
+}
+
diff --git a/src/gimp2/print.c b/src/gimp2/print.c
index ef61867..dd76d83 100644
--- a/src/gimp2/print.c
+++ b/src/gimp2/print.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print.c,v 1.7 2006/05/04 11:10:58 rlk Exp $"
+ * "$Id: print.c,v 1.8 2006/07/04 02:57:59 rlk Exp $"
*
* Print plug-in for the GIMP.
*
@@ -53,14 +53,6 @@ static int do_print_dialog (const gchar *proc_name,
gint32 image_ID);
/*
- * Work around GIMP library not being const-safe. This is a very ugly
- * hack, but the excessive warnings generated can mask more serious
- * problems.
- */
-
-#define BAD_CONST_CHAR char *
-
-/*
* Globals...
*/
@@ -119,26 +111,16 @@ query (void)
{ GIMP_PDB_INT32, (BAD_CONST_CHAR) "unit", (BAD_CONST_CHAR) "Unit 0=Inches 1=Metric" },
};
- static const gchar *blurb = "This plug-in prints images from The GIMP.";
- static const gchar *help = "Prints images to PostScript, PCL, or ESC/P2 printers.";
+ static const gchar *blurb = "This plug-in prints images from The GIMP using Gutenprint directly.";
+ static const gchar *help = "Prints images to many printers.";
static const gchar *auth = "Michael Sweet <mike@easysw.com> and Robert Krawitz <rlk@alum.mit.edu>";
- static const gchar *copy = "Copyright 1997-2000 by Michael Sweet and Robert Krawitz";
+ static const gchar *copy = "Copyright 1997-2006 by Michael Sweet and Robert Krawitz";
static const gchar *types = "RGB*,GRAY*,INDEXED*";
gimp_plugin_domain_register ((BAD_CONST_CHAR) PACKAGE, (BAD_CONST_CHAR) PACKAGE_LOCALE_DIR);
- gimp_install_procedure ((BAD_CONST_CHAR) "file_print_gimp",
- (BAD_CONST_CHAR) blurb,
- (BAD_CONST_CHAR) help,
- (BAD_CONST_CHAR) auth,
- (BAD_CONST_CHAR) copy,
- (BAD_CONST_CHAR) VERSION " - " RELEASE_DATE,
- /* Do not translate the prefix "<Image>" */
- (BAD_CONST_CHAR) N_("<Image>/File/Print..."),
- (BAD_CONST_CHAR) types,
- GIMP_PLUGIN,
- G_N_ELEMENTS (args), 0,
- args, NULL);
+ do_gimp_install_procedure(blurb, help, auth, copy, types, G_N_ELEMENTS(args),
+ args);
}
static guchar *gimp_thumbnail_data = NULL;
diff --git a/src/gimp2/print_gimp.h b/src/gimp2/print_gimp.h
index c6f9239..53d0a16 100644
--- a/src/gimp2/print_gimp.h
+++ b/src/gimp2/print_gimp.h
@@ -1,5 +1,5 @@
/*
- * "$Id: print_gimp.h,v 1.4 2004/11/01 20:46:34 rleigh Exp $"
+ * "$Id: print_gimp.h,v 1.5 2006/07/04 02:57:59 rlk Exp $"
*
* Print plug-in for the GIMP.
*
@@ -43,4 +43,17 @@
/* How to create an Image wrapping a Gimp drawable */
extern stpui_image_t *Image_GimpDrawable_new(GimpDrawable *drawable, gint32);
+extern void do_gimp_install_procedure(const char *blurb, const char *help,
+ const char *auth, const char *copy,
+ const char *types, int n_args,
+ GimpParamDef *args);
+
+/*
+ * Work around GIMP library not being const-safe. This is a very ugly
+ * hack, but the excessive warnings generated can mask more serious
+ * problems.
+ */
+
+#define BAD_CONST_CHAR char *
+
#endif /* __PRINT_GIMP_H__ */
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index 94c5726..96534d5 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -123,6 +123,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c
index 81ce574..ea8eb70 100644
--- a/src/gutenprintui/panel.c
+++ b/src/gutenprintui/panel.c
@@ -1,5 +1,5 @@
/*
- * "$Id: panel.c,v 1.7 2005/12/30 20:32:07 rlk Exp $"
+ * "$Id: panel.c,v 1.9 2006/07/16 21:02:22 rlk Exp $"
*
* Main window code for Print plug-in for the GIMP.
*
@@ -501,7 +501,7 @@ stpui_create_curve(option_t *opt,
opt->checkbox = gtk_check_button_new();
gtk_table_attach(GTK_TABLE(table), opt->checkbox,
column, column + 1, row, row + 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
if (is_optional)
gtk_widget_show(opt->checkbox);
else
@@ -523,7 +523,7 @@ stpui_create_curve(option_t *opt,
gtk_widget_show(opt->info.curve.button);
opt->info.curve.dialog =
- stpui_dialog_new(_(opt->fast_desc->text), _(opt->fast_desc->text),
+ stpui_dialog_new(gettext(opt->fast_desc->text), gettext(opt->fast_desc->text),
GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE,
_("Set Default"), set_default_curve_callback,
opt, NULL, NULL, FALSE, FALSE,
@@ -619,17 +619,17 @@ stpui_create_boolean(option_t *opt,
opt->checkbox = gtk_check_button_new();
gtk_table_attach(GTK_TABLE(table), opt->checkbox,
column, column + 1, row, row + 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
if (is_optional)
gtk_widget_show(opt->checkbox);
else
gtk_widget_hide(opt->checkbox);
opt->info.bool.checkbox =
- gtk_toggle_button_new_with_label(_(opt->fast_desc->text));
+ gtk_toggle_button_new_with_label(gettext(opt->fast_desc->text));
gtk_table_attach(GTK_TABLE(table), opt->info.bool.checkbox,
column + 1, column + 3, row, row + 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show(opt->info.bool.checkbox);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(opt->info.bool.checkbox),
@@ -943,9 +943,9 @@ populate_option_table(GtkWidget *table, int p_class)
if (level_count > 0 && current_pos > 0)
{
GtkWidget *sep = gtk_hseparator_new();
- gtk_table_attach(GTK_TABLE(table), sep, 0, 4,
- current_pos, current_pos + 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE(table), sep, 0, 4,
+ current_pos, current_pos + 1,
+ GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
if (previous_sep)
gtk_widget_show(previous_sep);
previous_sep = sep;
@@ -984,14 +984,14 @@ populate_option_table(GtkWidget *table, int p_class)
case STP_PARAMETER_TYPE_DOUBLE:
stpui_create_scale_entry(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), 200, 0,
+ gettext(desc->text), 200, 0,
opt->info.flt.deflt,
opt->info.flt.lower,
opt->info.flt.upper,
.001, .01, 3, TRUE, 0, 0, NULL,
!(desc->is_mandatory));
stpui_set_adjustment_tooltip(opt->info.flt.adjustment,
- _(desc->help));
+ gettext(desc->help));
gtk_signal_connect(GTK_OBJECT(opt->info.flt.adjustment),
"value_changed",
GTK_SIGNAL_FUNC(color_update), opt);
@@ -1023,7 +1023,7 @@ populate_option_table(GtkWidget *table, int p_class)
}
stpui_create_scale_entry(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), 200, 0,
+ gettext(desc->text), 200, 0,
opt->info.flt.deflt / unit_scaler,
opt->info.flt.lower / unit_scaler,
opt->info.flt.upper / unit_scaler,
@@ -1031,7 +1031,7 @@ populate_option_table(GtkWidget *table, int p_class)
digits, TRUE, 0, 0, NULL,
!(desc->is_mandatory));
stpui_set_adjustment_tooltip(opt->info.flt.adjustment,
- _(desc->help));
+ gettext(desc->help));
gtk_signal_connect(GTK_OBJECT(opt->info.flt.adjustment),
"value_changed",
GTK_SIGNAL_FUNC(dimension_update), opt);
@@ -1047,7 +1047,7 @@ populate_option_table(GtkWidget *table, int p_class)
opt->info.curve.current = NULL;
stpui_create_curve(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), opt->info.curve.deflt,
+ gettext(desc->text), opt->info.curve.deflt,
!(desc->is_mandatory));
if (desc->p_level > MAXIMUM_PARAMETER_LEVEL)
stp_set_curve_parameter_active(pv->v, desc->name,
@@ -1058,7 +1058,7 @@ populate_option_table(GtkWidget *table, int p_class)
stp_get_boolean_parameter(pv->v, opt->fast_desc->name);
stpui_create_boolean(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), opt->info.bool.deflt,
+ gettext(desc->text), opt->info.bool.deflt,
!(desc->is_mandatory));
if (desc->p_level > MAXIMUM_PARAMETER_LEVEL)
stp_set_boolean_parameter_active(pv->v, desc->name,
@@ -1293,7 +1293,7 @@ static GtkWidget *
create_positioning_button(GtkWidget *box, int invalid,
const char *text, const char *help)
{
- GtkWidget *button = gtk_button_new_with_label(_(text));
+ GtkWidget *button = gtk_button_new_with_label(gettext(text));
gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0);
gtk_widget_show(button);
stpui_set_help_data(button, help);
@@ -1871,9 +1871,8 @@ create_printer_settings_frame (void)
stpui_table_attach_aligned(GTK_TABLE (table), 0, vpos++, _("Printer Model:"),
0.0, 0.0, printer_model_label, 1, TRUE);
printer_hbox = gtk_hbox_new (TRUE, 4);
- gtk_table_attach(GTK_TABLE (table), printer_hbox,
- 1, 4, vpos, vpos + 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), printer_hbox,
+ 1, 4, vpos, vpos + 1, GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
vpos += 2;
gtk_widget_show (printer_hbox);
@@ -1908,7 +1907,7 @@ create_printer_settings_frame (void)
sep = gtk_hseparator_new ();
gtk_table_attach (GTK_TABLE (table), sep, 0, 5, vpos, vpos + 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (sep);
vpos++;
@@ -1988,7 +1987,7 @@ create_scaling_frame (void)
event_box = gtk_event_box_new ();
gtk_table_attach (GTK_TABLE (table), event_box, 0, 1, 0, 1,
- GTK_FILL, GTK_FILL, 0, 0);
+ GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (event_box);
label = gtk_label_new (_("Scale by:"));
@@ -2075,7 +2074,6 @@ create_color_adjust_window (void)
NULL, NULL, NULL, FALSE, FALSE,
_("Close"), gtk_widget_hide,
NULL, 1, NULL, TRUE, TRUE,
-
NULL);
table = gtk_table_new (1, 1, FALSE);
@@ -2175,6 +2173,7 @@ create_color_adjust_window (void)
gtk_table_set_row_spacings (GTK_TABLE (color_adjustment_table), 0);
gtk_container_set_border_width (GTK_CONTAINER (color_adjustment_table), 4);
gtk_widget_show (color_adjustment_table);
+
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -2306,7 +2305,7 @@ create_units_frame (void)
event_box = gtk_event_box_new ();
gtk_table_attach (GTK_TABLE (table), event_box, 0, 1, 0, 1,
- GTK_FILL, GTK_FILL, 0, 0);
+ GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (event_box);
label = gtk_label_new (_("Units:"));
@@ -2320,11 +2319,11 @@ create_units_frame (void)
for (i = 0; i < unit_count; i++)
{
unit_t *unit = &(units[i]);
- unit->checkbox = gtk_radio_button_new_with_label(group, _(unit->name));
+ unit->checkbox = gtk_radio_button_new_with_label(group, gettext(unit->name));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(unit->checkbox));
stpui_table_attach_aligned(GTK_TABLE(table), i / 2, i % 2, NULL, 0.5,
0.5, unit->checkbox, 1, TRUE);
- stpui_set_help_data(unit->checkbox, _(unit->help));
+ stpui_set_help_data(unit->checkbox, gettext(unit->help));
gtk_signal_connect(GTK_OBJECT(unit->checkbox), "toggled",
GTK_SIGNAL_FUNC(unit_callback), (gpointer) i);
}
@@ -2855,7 +2854,8 @@ do_color_updates (void)
opt->info.list.params, opt->is_active,
(stp_get_string_parameter
(pv->v, opt->fast_desc->name)),
- opt->info.list.default_val, combo_callback,
+ opt->info.list.default_val,
+ combo_callback,
&(opt->info.list.callback_id),
NULL, opt);
if (stp_check_string_parameter(pv->v, opt->fast_desc->name,
@@ -2912,6 +2912,40 @@ update_standard_print_command(void)
}
static void
+set_color_options(void)
+{
+ stp_parameter_t desc;
+ stp_describe_parameter(pv->v, "PrintingMode", &desc);
+ if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+ {
+ if (!stp_string_list_is_present(desc.bounds.str, "Color"))
+ {
+ gtk_widget_set_sensitive (output_types[1].button, TRUE);
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON (output_types[0].button)) == TRUE)
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (output_types[1].button), TRUE);
+ gtk_widget_set_sensitive (output_types[0].button, FALSE);
+ }
+ else if (!stp_string_list_is_present(desc.bounds.str, "BW"))
+ {
+ gtk_widget_set_sensitive (output_types[0].button, TRUE);
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON (output_types[1].button)) == TRUE)
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (output_types[0].button), TRUE);
+ gtk_widget_set_sensitive (output_types[1].button, FALSE);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (output_types[0].button, TRUE);
+ gtk_widget_set_sensitive (output_types[1].button, TRUE);
+ }
+ }
+ stp_parameter_description_destroy(&desc);
+}
+
+static void
do_all_updates(void)
{
gint i;
@@ -2948,6 +2982,7 @@ do_all_updates(void)
gtk_signal_emit_by_name (scaling_adjustment, "value_changed");
}
+ set_color_options();
for (i = 0; i < output_type_count; i++)
{
if (stp_get_string_parameter(pv->v, "PrintingMode") &&
@@ -3038,7 +3073,7 @@ queue_callback (GtkWidget *widget,
static void
setup_callback (GtkWidget *widget)
{
- gchar *new_value = gtk_entry_get_text (GTK_ENTRY (widget));
+ const gchar *new_value = gtk_entry_get_text (GTK_ENTRY (widget));
if (widget == custom_command_entry)
stpui_plist_set_custom_command(pv, new_value);
@@ -3060,7 +3095,6 @@ plist_callback (GtkWidget *widget,
{
gint i;
char *tmp;
- stp_parameter_t desc;
suppress_preview_update++;
invalidate_frame ();
@@ -3094,34 +3128,6 @@ plist_callback (GtkWidget *widget,
if (strcmp(stp_get_driver(pv->v), "") != 0)
tmp_printer = stp_get_printer(pv->v);
- stp_describe_parameter(pv->v, "PrintingMode", &desc);
- if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
- {
- if (!stp_string_list_is_present(desc.bounds.str, "Color"))
- {
- gtk_widget_set_sensitive (output_types[1].button, TRUE);
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (output_types[0].button)) == TRUE)
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON (output_types[1].button), TRUE);
- gtk_widget_set_sensitive (output_types[0].button, FALSE);
- }
- else if (!stp_string_list_is_present(desc.bounds.str, "BW"))
- {
- gtk_widget_set_sensitive (output_types[0].button, TRUE);
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (output_types[1].button)) == TRUE)
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON (output_types[0].button), TRUE);
- gtk_widget_set_sensitive (output_types[1].button, FALSE);
- }
- else
- {
- gtk_widget_set_sensitive (output_types[0].button, TRUE);
- gtk_widget_set_sensitive (output_types[1].button, TRUE);
- }
- }
- stp_parameter_description_destroy(&desc);
gtk_entry_set_text(GTK_ENTRY(file_entry),
stpui_plist_get_output_filename(pv));
tmp = stpui_build_standard_print_command(pv, stp_get_printer(pv->v));
@@ -3324,18 +3330,21 @@ combo_callback(GtkWidget *widget, gpointer data)
stpui_combo_get_name(option->info.list.combo, option->info.list.params);
const gchar *value =
stp_get_string_parameter(pv->v, option->fast_desc->name);
- reset_preview();
- if (!value || strcmp(value, new_value) != 0)
+ if (value && new_value)
{
- invalidate_frame();
- invalidate_preview_thumbnail();
- stp_set_string_parameter(pv->v, option->fast_desc->name, new_value);
- if (strcmp(option->fast_desc->name, "PageSize") == 0)
- set_media_size(new_value);
- g_idle_add(refresh_all_options, NULL);
- if (option->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT)
- update_adjusted_thumbnail(TRUE);
- preview_update();
+ reset_preview();
+ if (!value || strcmp(value, new_value) != 0)
+ {
+ invalidate_frame();
+ invalidate_preview_thumbnail();
+ stp_set_string_parameter(pv->v, option->fast_desc->name, new_value);
+ if (strcmp(option->fast_desc->name, "PageSize") == 0)
+ set_media_size(new_value);
+ g_idle_add(refresh_all_options, NULL);
+ if (option->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT)
+ update_adjusted_thumbnail(TRUE);
+ preview_update();
+ }
}
}
@@ -3352,6 +3361,7 @@ orientation_callback (GtkWidget *widget,
{
invalidate_preview_thumbnail ();
set_orientation((gint) data);
+ update_adjusted_thumbnail(TRUE);
preview_update ();
}
}
@@ -3943,11 +3953,11 @@ fill_buffer_writefunc(void *priv, const char *buffer, size_t bytes)
for (i = 0; i < pixels; i++)
{
if (mask & 1)
- where[0] = -xbuffer[0];
+ where[0] = ~xbuffer[0];
if (mask & 2)
- where[1] = -xbuffer[1];
+ where[1] = ~xbuffer[1];
if (mask & 4)
- where[2] = -xbuffer[2];
+ where[2] = ~xbuffer[2];
where += 3;
xbuffer += 3;
}
diff --git a/src/gutenprintui/plist.c b/src/gutenprintui/plist.c
index 90ab312..cea5a43 100644
--- a/src/gutenprintui/plist.c
+++ b/src/gutenprintui/plist.c
@@ -1,5 +1,5 @@
/*
- * "$Id: plist.c,v 1.2 2005/01/28 03:02:18 rlk Exp $"
+ * "$Id: plist.c,v 1.3 2006/07/16 23:07:32 rlk Exp $"
*
* Print plug-in for the GIMP.
*
@@ -216,7 +216,7 @@ stpui_set_printrc_file(const char *name)
{
const char *where = getenv("HOME");
if (where)
- printrc_name = g_strconcat(where, "/.gimpprintrc");
+ printrc_name = g_strconcat(where, "/.gutenprintrc", NULL);
}
}
@@ -1751,5 +1751,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
}
/*
- * End of "$Id: plist.c,v 1.2 2005/01/28 03:02:18 rlk Exp $".
+ * End of "$Id: plist.c,v 1.3 2006/07/16 23:07:32 rlk Exp $".
*/
diff --git a/src/gutenprintui/ui-utils.c b/src/gutenprintui/ui-utils.c
index 7c1a791..ebac462 100644
--- a/src/gutenprintui/ui-utils.c
+++ b/src/gutenprintui/ui-utils.c
@@ -1,5 +1,5 @@
/*
- * "$Id: ui-utils.c,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
+ * "$Id: ui-utils.c,v 1.2 2006/05/28 16:59:04 rlk Exp $"
*
* Main window code for Print plug-in for the GIMP.
*
@@ -761,11 +761,11 @@ stpui_create_radio_button(radio_group_t *radio, GSList *group,
GtkWidget *table, int hpos, int vpos,
GtkSignalFunc callback)
{
- radio->button = gtk_radio_button_new_with_label(group, _(radio->name));
+ radio->button = gtk_radio_button_new_with_label(group, gettext(radio->name));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio->button));
stpui_table_attach_aligned(GTK_TABLE(table), hpos, vpos, NULL, 0.5, 0.5,
radio->button, 1, FALSE);
- stpui_set_help_data(radio->button, _(radio->help));
+ stpui_set_help_data(radio->button, gettext(radio->help));
gtk_signal_connect(GTK_OBJECT(radio->button), "toggled",
GTK_SIGNAL_FUNC(callback), (gpointer) radio->value);
return group;
@@ -808,9 +808,9 @@ stpui_create_new_combo(option_t *option, GtkWidget *table,
gtk_container_add(GTK_CONTAINER(event_box), combo);
gtk_widget_show(combo);
gtk_widget_show(event_box);
- stpui_set_help_data(event_box, _(option->fast_desc->help));
+ stpui_set_help_data(event_box, gettext(option->fast_desc->help));
stpui_table_attach_aligned
- (GTK_TABLE(table), hpos + 1, vpos, _(option->fast_desc->text),
+ (GTK_TABLE(table), hpos + 1, vpos, gettext(option->fast_desc->text),
0.0, 0.5, event_box, 2, TRUE);
option->info.list.label = table_label(GTK_TABLE(table), hpos, vpos);
}
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 6c56519..9226fe7 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -125,6 +125,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index 466f684..d979ab7 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
/*
- * "$Id: panel.c,v 1.10 2006/03/18 23:56:37 rlk Exp $"
+ * "$Id: panel.c,v 1.11 2006/05/28 16:59:04 rlk Exp $"
*
* Main window code for Print plug-in for the GIMP.
*
@@ -523,7 +523,7 @@ stpui_create_curve(option_t *opt,
gtk_widget_show(opt->info.curve.button);
opt->info.curve.dialog =
- stpui_dialog_new(_(opt->fast_desc->text),
+ stpui_dialog_new(gettext(opt->fast_desc->text),
GTK_WIN_POS_MOUSE, TRUE,
_("Set Default"), set_default_curve_callback,
opt, NULL, NULL, FALSE, FALSE,
@@ -627,7 +627,7 @@ stpui_create_boolean(option_t *opt,
gtk_widget_hide(opt->checkbox);
opt->info.bool.checkbox =
- gtk_toggle_button_new_with_label(_(opt->fast_desc->text));
+ gtk_toggle_button_new_with_label(gettext(opt->fast_desc->text));
gtk_table_attach(GTK_TABLE(table), opt->info.bool.checkbox,
column + 1, column + 3, row, row + 1,
GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
@@ -985,14 +985,14 @@ populate_option_table(GtkWidget *table, int p_class)
case STP_PARAMETER_TYPE_DOUBLE:
stpui_create_scale_entry(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), 200, 0,
+ gettext(desc->text), 200, 0,
opt->info.flt.deflt,
opt->info.flt.lower,
opt->info.flt.upper,
.001, .01, 3, TRUE, 0, 0, NULL,
!(desc->is_mandatory));
stpui_set_adjustment_tooltip(opt->info.flt.adjustment,
- _(desc->help));
+ gettext(desc->help));
g_signal_connect(G_OBJECT(opt->info.flt.adjustment),
"value_changed",
G_CALLBACK(color_update), opt);
@@ -1024,7 +1024,7 @@ populate_option_table(GtkWidget *table, int p_class)
}
stpui_create_scale_entry(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), 200, 0,
+ gettext(desc->text), 200, 0,
opt->info.flt.deflt / unit_scaler,
opt->info.flt.lower / unit_scaler,
opt->info.flt.upper / unit_scaler,
@@ -1032,7 +1032,7 @@ populate_option_table(GtkWidget *table, int p_class)
digits, TRUE, 0, 0, NULL,
!(desc->is_mandatory));
stpui_set_adjustment_tooltip(opt->info.flt.adjustment,
- _(desc->help));
+ gettext(desc->help));
g_signal_connect(G_OBJECT(opt->info.flt.adjustment),
"value_changed",
G_CALLBACK(dimension_update), opt);
@@ -1048,7 +1048,7 @@ populate_option_table(GtkWidget *table, int p_class)
opt->info.curve.current = NULL;
stpui_create_curve(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), opt->info.curve.deflt,
+ gettext(desc->text), opt->info.curve.deflt,
!(desc->is_mandatory));
if (desc->p_level > MAXIMUM_PARAMETER_LEVEL)
stp_set_curve_parameter_active(pv->v, desc->name,
@@ -1059,7 +1059,7 @@ populate_option_table(GtkWidget *table, int p_class)
stp_get_boolean_parameter(pv->v, opt->fast_desc->name);
stpui_create_boolean(opt, GTK_TABLE(table), 0,
vpos[desc->p_level][desc->p_type]++,
- _(desc->text), opt->info.bool.deflt,
+ gettext(desc->text), opt->info.bool.deflt,
!(desc->is_mandatory));
if (desc->p_level > MAXIMUM_PARAMETER_LEVEL)
stp_set_boolean_parameter_active(pv->v, desc->name,
@@ -1294,7 +1294,7 @@ static GtkWidget *
create_positioning_button(GtkWidget *box, int invalid,
const char *text, const char *help)
{
- GtkWidget *button = gtk_button_new_with_label(_(text));
+ GtkWidget *button = gtk_button_new_with_label(gettext(text));
gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0);
gtk_widget_show(button);
stpui_set_help_data(button, help);
@@ -2326,11 +2326,11 @@ create_units_frame (void)
for (i = 0; i < unit_count; i++)
{
unit_t *unit = &(units[i]);
- unit->checkbox = gtk_radio_button_new_with_label(group, _(unit->name));
+ unit->checkbox = gtk_radio_button_new_with_label(group, gettext(unit->name));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(unit->checkbox));
stpui_table_attach_aligned(GTK_TABLE(table), i / 2, i % 2, NULL, 0.5,
0.5, unit->checkbox, 1, TRUE);
- stpui_set_help_data(unit->checkbox, _(unit->help));
+ stpui_set_help_data(unit->checkbox, gettext(unit->help));
g_signal_connect(G_OBJECT(unit->checkbox), "toggled",
G_CALLBACK(unit_callback), (gpointer) i);
}
diff --git a/src/gutenprintui2/ui-utils.c b/src/gutenprintui2/ui-utils.c
index b4ec44d..9b8cb01 100644
--- a/src/gutenprintui2/ui-utils.c
+++ b/src/gutenprintui2/ui-utils.c
@@ -1,5 +1,5 @@
/*
- * "$Id: ui-utils.c,v 1.2 2005/04/09 14:52:34 rlk Exp $"
+ * "$Id: ui-utils.c,v 1.3 2006/05/28 16:59:04 rlk Exp $"
*
* Main window code for Print plug-in for the GIMP.
*
@@ -765,11 +765,11 @@ stpui_create_radio_button(radio_group_t *radio, GSList *group,
GtkWidget *table, int hpos, int vpos,
GCallback callback)
{
- radio->button = gtk_radio_button_new_with_label(group, _(radio->name));
+ radio->button = gtk_radio_button_new_with_label(group, gettext(radio->name));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio->button));
stpui_table_attach_aligned(GTK_TABLE(table), hpos, vpos, NULL, 0.5, 0.5,
radio->button, 1, FALSE);
- stpui_set_help_data(radio->button, _(radio->help));
+ stpui_set_help_data(radio->button, gettext(radio->help));
g_signal_connect(G_OBJECT(radio->button), "toggled",
G_CALLBACK(callback), (gpointer) radio->value);
return group;
@@ -812,9 +812,9 @@ stpui_create_new_combo(option_t *option, GtkWidget *table,
gtk_container_add(GTK_CONTAINER(event_box), combo);
gtk_widget_show(combo);
gtk_widget_show(event_box);
- stpui_set_help_data(event_box, _(option->fast_desc->help));
+ stpui_set_help_data(event_box, gettext(option->fast_desc->help));
stpui_table_attach_aligned
- (GTK_TABLE(table), hpos + 1, vpos, _(option->fast_desc->text),
+ (GTK_TABLE(table), hpos + 1, vpos, gettext(option->fast_desc->text),
0.0, 0.5, event_box, 2, TRUE);
option->info.list.label = table_label(GTK_TABLE(table), hpos, vpos);
}
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index b387ad5..0ef0165 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -195,6 +195,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
diff --git a/src/main/dither-main.c b/src/main/dither-main.c
index 62d6082..759c17a 100644
--- a/src/main/dither-main.c
+++ b/src/main/dither-main.c
@@ -1,5 +1,5 @@
/*
- * "$Id: dither-main.c,v 1.51 2005/12/29 04:07:46 rlk Exp $"
+ * "$Id: dither-main.c,v 1.52 2006/05/28 16:59:04 rlk Exp $"
*
* Dither routine entrypoints
*
@@ -41,14 +41,13 @@
static const stpi_dither_algorithm_t dither_algos[] =
{
- /* Note to translators: "EvenTone" is the proper name, rather than a */
+ /* TRANSLATORS: "EvenTone" is the proper name, rather than a */
/* descriptive name, of this algorithm. */
{ "None", N_ ("Default"), -1 },
{ "EvenTone", N_ ("EvenTone"), D_EVENTONE },
{ "HybridEvenTone", N_ ("Hybrid EvenTone"), D_HYBRID_EVENTONE },
- /*
- * Placeholders for future implementation of EvenBetter Screening
- * Translators: EvenTone, EvenBetter, and UniTone are proper
+ /* Placeholders for future implementation of EvenBetter Screening */
+ /* TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
* names, not descriptive.
*/
{ "EBS", N_ ("EvenBetter"), D_INVALID },
@@ -145,7 +144,7 @@ stp_dither_describe_parameter(const stp_vars_t *v, const char *name,
const stpi_dither_algorithm_t *dt = &dither_algos[i];
if (dt->id != D_INVALID)
stp_string_list_add_string(description->bounds.str,
- dt->name, dt->text);
+ dt->name, gettext(dt->text));
}
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
@@ -180,7 +179,7 @@ stpi_set_dither_function(stp_vars_t *v)
{
for (i = 0; i < num_dither_algos; i++)
{
- if (!strcmp(algorithm, _(dither_algos[i].name)))
+ if (!strcmp(algorithm, gettext(dither_algos[i].name)))
{
d->stpi_dither_type = dither_algos[i].id;
break;
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 6f258ba..e12edbf 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-channels.c,v 1.61 2006/01/31 03:09:48 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.62 2006/06/01 23:49:33 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -671,7 +671,7 @@ DECLARE_INK_CHANNEL(f360_photo2_black);
static const physical_subchannel_t photo3_black_subchannels[] =
{
{ 0, 0, 0, "BlackDensity", NULL },
- { 0, 1, 0, "BlackDensity", "GrayTransition" },
+ { 0, 1, 0, "BlackDensity", "DarkGrayTransition" },
{ 0, 3, 0, "BlackDensity", "LightGrayTransition" }
};
@@ -680,7 +680,7 @@ DECLARE_INK_CHANNEL(photo3_black);
static const physical_subchannel_t f360_photo3_black_subchannels[] =
{
{ 0, 0, 1, "BlackDensity", NULL },
- { 0, 1, 0, "BlackDensity", "GrayTransition" },
+ { 0, 1, 0, "BlackDensity", "DarkGrayTransition" },
{ 0, 3, 1, "BlackDensity", "LightGrayTransition" }
};
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index 845a7a1..24ef1c1 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-driver.c,v 1.28 2006/04/30 21:29:52 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.30 2006/07/22 20:28:13 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -113,6 +113,7 @@ print_debug_params(stp_vars_t *v)
print_remote_int_param(v, "Page_width", pd->page_width);
print_remote_int_param(v, "Page_height", pd->page_height);
print_remote_int_param(v, "Page_true_height", pd->page_true_height);
+ print_remote_int_param(v, "Page_extra_height", pd->page_extra_height);
print_remote_int_param(v, "Image_left", pd->image_left);
print_remote_int_param(v, "Image_top", pd->image_top);
print_remote_int_param(v, "Image_width", pd->image_width);
@@ -340,10 +341,29 @@ escp2_set_printhead_speed(stp_vars_t *v)
unidirectional = 1;
else if (direction && strcmp(direction, "Bidirectional") == 0)
unidirectional = 0;
- else if (pd->res->hres >= 720 && pd->res->vres >= 720)
- unidirectional = 1;
+ else if (pd->res->printed_hres * pd->res->printed_vres *
+ pd->res->vertical_passes >= pd->bidirectional_upper_limit)
+ {
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Setting unidirectional: hres %d vres %d passes %d total %d limit %d\n",
+ pd->res->printed_hres, pd->res->printed_vres,
+ pd->res->vertical_passes,
+ (pd->res->printed_hres * pd->res->printed_vres *
+ pd->res->vertical_passes),
+ pd->bidirectional_upper_limit);
+ unidirectional = 1;
+ }
else
- unidirectional = 0;
+ {
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Setting bidirectional: hres %d vres %d passes %d total %d limit %d\n",
+ pd->res->printed_hres, pd->res->printed_vres,
+ pd->res->vertical_passes,
+ (pd->res->printed_hres * pd->res->printed_vres *
+ pd->res->vertical_passes),
+ pd->bidirectional_upper_limit);
+ unidirectional = 0;
+ }
if (unidirectional)
{
stp_send_command(v, "\033U", "c", 1);
@@ -397,7 +417,8 @@ escp2_set_form_factor(stp_vars_t *v)
if (pd->advanced_command_set)
{
int w = pd->page_width * pd->page_management_units / 72;
- int h = pd->page_true_height * pd->page_management_units / 72;
+ int h = (pd->page_true_height + pd->page_extra_height) *
+ pd->page_management_units / 72;
if (stp_get_boolean_parameter(v, "FullBleed"))
/* Make the page 160/360" wider for full bleed printing. */
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 6a71ac1..c32e51f 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-papers.c,v 1.97 2006/04/13 12:10:04 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.99 2006/05/31 23:15:22 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -911,45 +911,45 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo);
static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] =
{
- { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, .6, 1, .92,
+ { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
- { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92,
+ { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
- { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92,
+ { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
- { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
- { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, .6, 1, 1.0,
+ { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
};
@@ -1011,47 +1011,47 @@ DECLARE_PAPER_ADJUSTMENTS(r800_photo);
static const paper_adjustment_t r800_matte_adjustments[] =
{
- { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Plain", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "PlainFast", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Postcard", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "GlossyFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Transparency", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Envelope", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "BackFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Matte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .250, .6, 1, 1.0,
+ { "MatteHeavy", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Inkjet", 0.72, .3, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Coated", 0.83, .4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Photo", 1.0, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "GlossyPhoto", 0.546, 1, .5, .025, .5, .882, 1, .250, .6, 1, 0.92,
+ { "GlossyPhoto", 0.546, 1, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
- { "Semigloss", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92,
+ { "Semigloss", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
- { "Luster", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92,
+ { "Luster", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
- { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "ArchivalMatte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "WaterColorRadiant", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "GlossyPaper", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Ilford", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "ColorLife", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
- { "Other", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
+ { "Other", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
};
diff --git a/src/main/generic-options.c b/src/main/generic-options.c
index 25bc373..fc9746c 100644
--- a/src/main/generic-options.c
+++ b/src/main/generic-options.c
@@ -1,5 +1,5 @@
/*
- * "$Id: generic-options.c,v 1.9 2004/11/22 13:31:40 rlk Exp $"
+ * "$Id: generic-options.c,v 1.10 2006/05/28 16:59:04 rlk Exp $"
*
* Copyright 2003 Robert Krawitz (rlk@alum.mit.edu)
*
@@ -215,7 +215,7 @@ stpi_describe_generic_parameter(const stp_vars_t *v, const char *name,
{
const stpi_quality_t *qual = stpi_get_quality_by_index(i);
stp_string_list_add_string(description->bounds.str, qual->name,
- qual->text);
+ gettext(qual->text));
}
description->deflt.str = "Standard";
#else
@@ -232,7 +232,7 @@ stpi_describe_generic_parameter(const stp_vars_t *v, const char *name,
{
const stpi_image_type_t *itype = stpi_get_image_type_by_index(i);
stp_string_list_add_string(description->bounds.str, itype->name,
- itype->text);
+ gettext(itype->text));
}
description->deflt.str = "TextGraphics";
}
@@ -243,7 +243,7 @@ stpi_describe_generic_parameter(const stp_vars_t *v, const char *name,
{
const stpi_job_mode_t *itype = stpi_get_job_mode_by_index(i);
stp_string_list_add_string(description->bounds.str, itype->name,
- itype->text);
+ gettext(itype->text));
}
description->deflt.str = "Page";
}
diff --git a/src/main/path.c b/src/main/path.c
index d59c625..03ad06e 100644
--- a/src/main/path.c
+++ b/src/main/path.c
@@ -1,5 +1,5 @@
/*
- * "$Id: path.c,v 1.18 2005/10/18 02:08:17 rlk Exp $"
+ * "$Id: path.c,v 1.19 2006/07/07 21:31:02 rleigh Exp $"
*
* Gutenprint path functions - split and search paths.
*
@@ -49,8 +49,8 @@ static int
dirent_sort(const void *a,
const void *b)
{
- return strcoll ((*(const struct dirent **) a)->d_name,
- (*(const struct dirent **) b)->d_name);
+ return strcoll ((*(const struct dirent * const *) a)->d_name,
+ (*(const struct dirent * const *) b)->d_name);
}
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 090e9f1..5104c40 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-canon.c,v 1.173 2006/05/12 22:43:23 rlk Exp $"
+ * "$Id: print-canon.c,v 1.174 2006/05/28 16:59:04 rlk Exp $"
*
* Print plug-in CANON BJL driver for the GIMP.
*
@@ -2001,7 +2001,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
if (stp_string_list_count(description->bounds.str) == 0)
description->deflt.str = pt->name;
stp_string_list_add_string(description->bounds.str,
- pt->name, pt->text);
+ pt->name, gettext(pt->text));
}
}
}
@@ -2021,14 +2021,14 @@ canon_parameters(const stp_vars_t *v, const char *name,
while (res->x > 0) {
if (xx == res->x && yy == res->y) {
stp_string_list_add_string(description->bounds.str,
- res->name, _(res->text));
+ res->name, gettext(res->text));
stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n",
res->name);
if (xx >= 300 && yy >= 300 && description->deflt.str == NULL)
description->deflt.str = res->name;
if (t == 1) {
stp_string_list_add_string(description->bounds.str,
- res->name_dmt, _(res->text_dmt));
+ res->name_dmt, gettext(res->text_dmt));
stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n",
res->name_dmt);
}
@@ -2086,7 +2086,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < count; i ++)
stp_string_list_add_string(description->bounds.str,
canon_paper_list[i].name,
- _(canon_paper_list[i].text));
+ gettext(canon_paper_list[i].text));
}
else if (strcmp(name, "InputSlot") == 0)
{
@@ -2096,7 +2096,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < count; i ++)
stp_string_list_add_string(description->bounds.str,
media_sources[i].name,
- _(media_sources[i].text));
+ gettext(media_sources[i].text));
}
else if (strcmp(name, "PrintingMode") == 0)
{
@@ -2133,7 +2133,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
for (i=0; i < NUM_DUPLEX; i++)
{
stp_string_list_add_string(description->bounds.str,
- duplex_types[i].name,_(duplex_types[i].text));
+ duplex_types[i].name,gettext(duplex_types[i].text));
}
}
else
diff --git a/src/main/print-color.c b/src/main/print-color.c
index 43eedc4..733789b 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-color.c,v 1.134 2005/12/30 20:31:35 rlk Exp $"
+ * "$Id: print-color.c,v 1.135 2006/05/28 16:59:04 rlk Exp $"
*
* Gutenprint color management module - traditional Gutenprint algorithm.
*
@@ -1547,7 +1547,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
for (j = 0; j < color_correction_count; j++)
stp_string_list_add_string
(description->bounds.str, color_corrections[j].name,
- _(color_corrections[j].text));
+ gettext(color_corrections[j].text));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
}
@@ -1575,14 +1575,14 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
stp_string_list_add_string
(description->bounds.str,
color_descriptions[j].name,
- _(color_descriptions[j].name));
+ gettext(color_descriptions[j].name));
stp_parameter_description_destroy(&desc);
}
else
stp_string_list_add_string
(description->bounds.str,
color_descriptions[j].name,
- _(color_descriptions[j].name));
+ gettext(color_descriptions[j].name));
}
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
@@ -1594,7 +1594,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
if (color_descriptions[j].output)
stp_string_list_add_string
(description->bounds.str, color_descriptions[j].name,
- _(color_descriptions[j].name));
+ gettext(color_descriptions[j].name));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
}
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index e5c33d7..43f496b 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-escp2-data.c,v 1.199 2006/05/06 21:30:59 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.202 2006/07/22 20:28:13 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -28,6 +28,7 @@
#include "gutenprint-internal.h"
#include <gutenprint/gutenprint-intl-internal.h>
#include "print-escp2.h"
+#include <limits.h>
/*
* Dot sizes are for:
@@ -704,8 +705,8 @@ static const quality_t p1_5_qualities[] =
{ "Standard", N_("Standard"), 0, 0, 0, 0, 720, 360 },
{ "High", N_("High"), 0, 0, 0, 0, 720, 720 },
{ "Photo", N_("Photo"), 1440, 720, 1440, 720, 1440, 720 },
- { "HighPhoto", N_("Super Photo"), 1440, 1440, 1440, 1440, 1440, 1440 },
- { "UltraPhoto", N_("Ultra Photo"), 1440, 2880, 1440, 2880, 1440, 2880 },
+ { "HighPhoto", N_("Super Photo"), 1440, 1440, 2880, 1440, 1440, 1440 },
+ { "UltraPhoto", N_("Ultra Photo"), 2880, 2880, 2880, 2880, 2880, 2880 },
{ "Best", N_("Best"), 720, 360, 0, 0, -1, -1 },
};
@@ -875,9 +876,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
15, 1, 4, 15, 1, 4, 15, 1, 4, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g1_dotsizes, g1_densities, &stpi_escp2_simple_drops,
stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -892,9 +893,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g2_dotsizes, g1_densities, &stpi_escp2_simple_drops,
stpi_escp2_sc500_reslist, &stpi_escp2_standard_inkgroup,
@@ -909,9 +910,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17), INCH(44), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g1_dotsizes, sc1500_densities, &stpi_escp2_simple_drops,
stpi_escp2_sc500_reslist, &stpi_escp2_cmy_inkgroup,
@@ -926,9 +927,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
+ 8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
sc600_dotsizes, g3_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
@@ -943,9 +944,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
- 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
+ 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
@@ -960,9 +961,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
- 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
@@ -977,9 +978,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
- 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
INCH(17), INCH(44), INCH(2), INCH(2),
- 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
+ 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
@@ -996,9 +997,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 15, 0, 0, /* Is it really 15 pairs??? */
sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1013,9 +1014,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_NO | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(118 / 10), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1030,9 +1031,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_720dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1049,9 +1050,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
21, 1, 4, 21, 1, 4, 21, 1, 4, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 15, 0, 0,
sc440_dotsizes, sc440_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_720dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1066,9 +1067,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 15, 0, 0,
sc640_dotsizes, sc440_densities, &stpi_escp2_simple_drops,
stpi_escp2_sc640_reslist, &stpi_escp2_standard_inkgroup,
@@ -1083,9 +1084,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1100,9 +1101,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
- 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c3pl_dotsizes, c3pl_densities, &stpi_escp2_variable_3pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1117,9 +1118,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1134,9 +1135,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1151,9 +1152,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1168,9 +1169,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1185,9 +1186,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0,
+ 9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0, 0,
1, 15, 0, 0,
sc660_dotsizes, sc660_densities, &stpi_escp2_simple_drops,
stpi_escp2_sc640_reslist, &stpi_escp2_standard_inkgroup,
@@ -1202,9 +1203,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1219,9 +1220,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sp720_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1236,9 +1237,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
MODEL_PACKET_MODE_YES),
15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
- 360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
+ 360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
stpi_escp2_720dpi_soft_reslist, &stpi_escp2_x80_inkgroup,
@@ -1253,9 +1254,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1270,9 +1271,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1287,9 +1288,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
- 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
INCH(17), INCH(44), INCH(2), INCH(2),
- 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
+ 8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
@@ -1304,9 +1305,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
32, 1, 4, 64, 1, 2, 64, 1, 2, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sc670_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1321,9 +1322,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
2, 15, 0, 0,
sp2000_dotsizes, sp2000_densities, &stpi_escp2_variable_2000p_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_pigment_inkgroup,
@@ -1338,9 +1339,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
- 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4, 1,
+ 360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4, 1, 720 * 720,
INCH(13), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro5000_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1355,9 +1356,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(24), INCH(1200), INCH(7), INCH(7),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro_dye_dotsizes, spro_dye_densities, &stpi_escp2_simple_drops,
stpi_escp2_pro_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1372,9 +1373,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(24), INCH(1200), INCH(7), INCH(7),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops,
stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup,
@@ -1389,9 +1390,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(44), INCH(1200), INCH(7), INCH(7),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro_dye_dotsizes, spro_dye_densities, &stpi_escp2_simple_drops,
stpi_escp2_pro_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1406,9 +1407,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(44), INCH(1200), INCH(7), INCH(7),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops,
stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup,
@@ -1423,9 +1424,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1440,9 +1441,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1457,9 +1458,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
- 360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c3pl_dotsizes, sc980_densities, &stpi_escp2_variable_3pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1474,9 +1475,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1491,9 +1492,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1508,9 +1509,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1525,9 +1526,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
MODEL_PACKET_MODE_YES),
15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
- 360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
+ 360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
@@ -1542,9 +1543,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g1_dotsizes, g1_densities, &stpi_escp2_simple_drops,
stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1559,9 +1560,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops,
stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup,
@@ -1576,9 +1577,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(44), INCH(1200), INCH(7), INCH(7),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
1, 7, 0, 0,
spro10000_dotsizes, spro10000_densities, &stpi_escp2_spro10000_drops,
stpi_escp2_pro_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1593,9 +1594,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
MODEL_PACKET_MODE_YES),
15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
stpi_escp2_720dpi_soft_reslist, &stpi_escp2_x80_inkgroup,
@@ -1610,9 +1611,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
MODEL_PACKET_MODE_YES),
15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
@@ -1627,9 +1628,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
60, 60, 2, 180, 180, 2, 180, 180, 2, 4,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c80_inkgroup,
@@ -1644,9 +1645,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_NO),
16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
- 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(44), INCH(2), INCH(2),
- 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
1, 7, 0, 0,
g1_dotsizes, g1_densities, &stpi_escp2_simple_drops,
stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1661,9 +1662,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
4, 15, 0, 0,
c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo_inkgroup,
@@ -1678,9 +1679,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
96, 96, 2, 96, 96, 2, 192, 192, 1, 7,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
4, 15, 0, 0,
c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_f360_ultrachrome_inkgroup,
@@ -1695,9 +1696,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440,
INCH(24), INCH(1200), INCH(7), INCH(7),
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops,
stpi_escp2_pro_reslist, &stpi_escp2_ultrachrome_inkgroup,
@@ -1712,9 +1713,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440,
INCH(44), INCH(1200), INCH(7), INCH(7),
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops,
stpi_escp2_pro_reslist, &stpi_escp2_ultrachrome_inkgroup,
@@ -1729,9 +1730,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1746,9 +1747,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1763,9 +1764,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
- 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
@@ -1780,9 +1781,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
4, 15, 0, 0,
c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo7_japan_inkgroup,
@@ -1797,9 +1798,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
INCH(13), INCH(44), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
sp720_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
@@ -1814,9 +1815,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup,
@@ -1831,9 +1832,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
- 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
+ 360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_x80_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
@@ -1848,9 +1849,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
180, 180, 2, 360, 360, 1, 360, 360, 1, 7,
- 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c1_8pl_dotsizes, c1_8pl_densities, &stpi_escp2_variable_2pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo7_japan_inkgroup,
@@ -1865,9 +1866,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 90, 2, 90, 90, 2, 90, 90, 2, 6,
- 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c1_8pl_dotsizes, c1_8pl_densities, &stpi_escp2_variable_2pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1882,9 +1883,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
MODEL_PACKET_MODE_YES),
15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_x80_6pl_drops,
stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
@@ -1899,9 +1900,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
- 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup,
@@ -1916,9 +1917,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
- 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
@@ -1933,9 +1934,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
- 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842, 0,
3, 15, 0, 0,
c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
@@ -1950,9 +1951,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
- 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
4, 15, 0, 0,
p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
@@ -1967,9 +1968,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
- 360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
+ 360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11,
4, 15, 0, 0,
p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup,
@@ -1984,9 +1985,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
- 360, 14400, -1, 1440, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 8,
+ 360, 14400, -1, 1440, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 8, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
4, 15, 0, 0,
p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
stpi_escp2_cx3650_reslist, &stpi_escp2_cx3650_inkgroup,
@@ -2001,9 +2002,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
- 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
@@ -2018,9 +2019,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
- 360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
+ 360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11,
4, 15, 0, 0,
p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup,
@@ -2035,9 +2036,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
- 360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
+ 360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11,
4, 15, 0, 0,
p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
stpi_escp2_r2400_reslist, &stpi_escp2_photo_gen3_inkgroup,
@@ -2052,9 +2053,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
- 360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1,
+ 360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 1440 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup,
@@ -2069,9 +2070,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
- 360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 0,
4, 15, 0, 0,
p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
@@ -2086,9 +2087,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
- 360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8,
+ 360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 1440 * 1440,
INCH(13), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
4, 15, 0, 0,
p3_5pl_dotsizes, p3_5pl_densities, &stpi_escp2_variable_r2400_drops,
stpi_escp2_r2400_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup,
@@ -2103,9 +2104,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
- 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
@@ -2120,9 +2121,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
- 360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0, 1,
+ 360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440,
INCH(4), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
4, 15, 0, 0,
picturemate_dotsizes, picturemate_densities, &stpi_escp2_variable_picturemate_drops,
stpi_escp2_picturemate_reslist, &stpi_escp2_picturemate_inkgroup,
@@ -2137,9 +2138,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
- 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
4, 15, 0, 0,
c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
@@ -2154,9 +2155,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
- 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
4, 15, 0, 0,
c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
@@ -2171,9 +2172,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 90, 3, 90, 90, 3, 90, 90, 3, 6,
- 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
4, 15, 0, 0,
c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
@@ -2188,9 +2189,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
MODEL_PACKET_MODE_YES),
90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
- 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1,
+ 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
- 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
4, 15, 0, 0,
p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 42b7c62..d97634b 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-escp2.c,v 1.350 2006/04/30 21:29:53 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.354 2006/07/22 20:28:14 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -386,6 +386,7 @@ static const stp_parameter_t the_parameters[] =
PARAMETER_INT(zero_margin_offset),
PARAMETER_INT(extra_720dpi_separation),
PARAMETER_INT(horizontal_position_alignment),
+ PARAMETER_INT(bidirectional_upper_limit),
PARAMETER_INT(physical_channels),
PARAMETER_INT(left_margin),
PARAMETER_INT(right_margin),
@@ -399,6 +400,7 @@ static const stp_parameter_t the_parameters[] =
PARAMETER_INT(cd_y_offset),
PARAMETER_INT(cd_page_width),
PARAMETER_INT(cd_page_height),
+ PARAMETER_INT(page_extra_height),
PARAMETER_RAW(preinit_sequence),
PARAMETER_RAW(postinit_remote_sequence)
};
@@ -498,6 +500,14 @@ static const float_param_t float_parameters[] =
},
{
{
+ "DarkGrayTransition", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
+ N_("Gray Transition"),
+ STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+ STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+ }, 0.0, 5.0, 1.0, 1
+ },
+ {
+ {
"LightGrayTransition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
N_("Light Gray Transition"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
@@ -657,6 +667,7 @@ DEF_SIMPLE_ACCESSOR(cd_x_offset, int)
DEF_SIMPLE_ACCESSOR(cd_y_offset, int)
DEF_SIMPLE_ACCESSOR(cd_page_width, int)
DEF_SIMPLE_ACCESSOR(cd_page_height, int)
+DEF_SIMPLE_ACCESSOR(page_extra_height, int)
DEF_SIMPLE_ACCESSOR(extra_feed, unsigned)
DEF_SIMPLE_ACCESSOR(pseudo_separation_rows, int)
DEF_SIMPLE_ACCESSOR(base_separation, int)
@@ -667,6 +678,7 @@ DEF_SIMPLE_ACCESSOR(max_black_resolution, int)
DEF_SIMPLE_ACCESSOR(zero_margin_offset, int)
DEF_SIMPLE_ACCESSOR(extra_720dpi_separation, int)
DEF_SIMPLE_ACCESSOR(horizontal_position_alignment, unsigned)
+DEF_SIMPLE_ACCESSOR(bidirectional_upper_limit, int)
DEF_SIMPLE_ACCESSOR(physical_channels, int)
DEF_SIMPLE_ACCESSOR(alignment_passes, int)
DEF_SIMPLE_ACCESSOR(alignment_choices, int)
@@ -970,44 +982,40 @@ get_resolution_bounds_by_paper_type(const stp_vars_t *v,
*max_y = 720;
break;
}
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Paper %s class %d: min_x %d min_y %d max_x %d max_y %d\n",
+ paper->text, paper->paper_class, *min_x, *min_y,
+ *max_x, *max_y);
}
}
static int
verify_resolution_by_paper_type(const stp_vars_t *v, const res_t *res)
{
- const paper_t *paper = get_media_type(v);
- if (paper)
+ unsigned min_x = 0;
+ unsigned min_y = 0;
+ unsigned max_x = 0;
+ unsigned max_y = 0;
+ get_resolution_bounds_by_paper_type(v, &max_x, &max_y, &min_x, &min_y);
+ if ((max_x == 0 || res->printed_hres <= max_x) &&
+ (max_y == 0 || res->printed_vres <= max_y) &&
+ (min_x == 0 || res->printed_hres >= min_x) &&
+ (min_y == 0 || res->printed_vres >= min_y))
+ {
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Resolution %s (%d, %d) GOOD (%d, %d, %d, %d)\n",
+ res->name, res->printed_hres, res->printed_vres,
+ min_x, min_y, max_x, max_y);
+ return 1;
+ }
+ else
{
- switch (paper->paper_class)
- {
- case PAPER_PLAIN:
- if (res->printed_vres > 720 || res->hres > 720)
- return 0;
- break;
- case PAPER_GOOD:
- if (res->printed_vres < 180 || res->hres < 360 ||
- res->printed_vres > 720 || res->hres > 1440)
- return 0;
- break;
- case PAPER_PHOTO:
- if (res->printed_vres < 360 ||
- (res->hres < 720 && res->hres < escp2_max_hres(v)))
- return 0;
- break;
- case PAPER_PREMIUM_PHOTO:
- if (res->printed_vres < 720 ||
- (res->hres < 720 && res->hres < escp2_max_hres(v)))
- return 0;
- break;
- case PAPER_TRANSPARENCY:
- if (res->printed_vres < 360 || res->hres < 360 ||
- res->printed_vres > 720 || res->hres > 720)
- return 0;
- break;
- }
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Resolution %s (%d, %d) BAD (%d, %d, %d, %d)\n",
+ res->name, res->printed_hres, res->printed_vres,
+ min_x, min_y, max_x, max_y);
+ return 0;
}
- return 1;
}
static int
@@ -1042,6 +1050,37 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
return 0;
}
+static void
+get_printer_resolution_bounds(const stp_vars_t *v,
+ unsigned *max_x, unsigned *max_y,
+ unsigned *min_x, unsigned *min_y)
+{
+ int i = 0;
+ const res_t *const *res = escp2_reslist(v);
+ *max_x = 0;
+ *max_y = 0;
+ *min_x = 0;
+ *min_y = 0;
+ while (res[i])
+ {
+ if (verify_resolution(v, res[i]))
+ {
+ if (res[i]->printed_hres * res[i]->vertical_passes > *max_x)
+ *max_x = res[i]->printed_hres * res[i]->vertical_passes;
+ if (res[i]->printed_vres > *max_y)
+ *max_y = res[i]->printed_vres;
+ if (*min_x == 0 ||
+ res[i]->printed_hres * res[i]->vertical_passes < *min_x)
+ *min_x = res[i]->printed_hres * res[i]->vertical_passes;
+ if (*min_y == 0 || res[i]->printed_vres < *min_y)
+ *min_y = res[i]->printed_vres;
+ }
+ i++;
+ }
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Printer bounds: %d %d %d %d\n", *min_x, *min_y, *max_x, *max_y);
+}
+
static int
printer_supports_rollfeed(const stp_vars_t *v)
{
@@ -1300,6 +1339,8 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
i--;
while (i >= 0)
{
+ stp_dprintf(STP_DBG_ESCP2, v, "Checking resolution %s %d...",
+ res[i]->name, i);
if (verify_resolution(v, res[i]) &&
verify_resolution_by_paper_type(v, res[i]))
return res[i];
@@ -1346,7 +1387,28 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
if (verify_resolution(v, res[i]) &&
res[i]->printed_vres == desired_vres &&
res[i]->printed_hres == desired_hres)
- return res[i];
+ {
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Found desired resolution w/o oversample: %s %d: %d * %d, %d\n",
+ res[i]->name, i, res[i]->printed_hres,
+ res[i]->vertical_passes, res[i]->printed_vres);
+ return res[i];
+ }
+ i++;
+ }
+ i = 0;
+ while (res[i])
+ {
+ if (verify_resolution(v, res[i]) &&
+ res[i]->printed_vres == desired_vres &&
+ res[i]->printed_hres * res[i]->vertical_passes == desired_hres)
+ {
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Found desired resolution: %s %d: %d * %d, %d\n",
+ res[i]->name, i, res[i]->printed_hres,
+ res[i]->vertical_passes, res[i]->printed_vres);
+ return res[i];
+ }
i++;
}
i = 0;
@@ -1355,9 +1417,17 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
if (verify_resolution(v, res[i]) &&
(q->min_vres == 0 || res[i]->printed_vres >= q->min_vres) &&
(q->max_vres == 0 || res[i]->printed_vres <= q->max_vres) &&
- (q->min_hres == 0 || res[i]->printed_hres >= q->min_hres) &&
- (q->max_hres == 0 || res[i]->printed_hres <= q->max_hres))
- return res[i];
+ (q->min_hres == 0 ||
+ res[i]->printed_hres * res[i]->vertical_passes >=q->min_hres) &&
+ (q->max_hres == 0 ||
+ res[i]->printed_hres * res[i]->vertical_passes <= q->max_hres))
+ {
+ stp_dprintf(STP_DBG_ESCP2, v,
+ "Found acceptable resolution: %s %d: %d * %d, %d\n",
+ res[i]->name, i, res[i]->printed_hres,
+ res[i]->vertical_passes, res[i]->printed_vres);
+ return res[i];
+ }
i++;
}
}
@@ -1368,10 +1438,10 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
while (res[i])
{
if (verify_resolution(v, res[i]) &&
- res[i]->vres >= desired_vres &&
- res[i]->hres >= desired_hres &&
- res[i]->vres <= 2 * desired_vres &&
- res[i]->hres <= 2 * desired_hres)
+ res[i]->printed_vres >= desired_vres &&
+ res[i]->printed_hres * res[i]->vertical_passes >= desired_hres &&
+ res[i]->printed_vres <= 2 * desired_vres &&
+ res[i]->printed_hres * res[i]->vertical_passes <= 2 * desired_hres)
return res[i];
i++;
}
@@ -1383,13 +1453,23 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
static int
verify_quality(const stp_vars_t *v, const quality_t *q)
{
- if ((q->max_vres == 0 || escp2_min_vres(v) <= q->max_vres) &&
- (q->max_hres == 0 || escp2_min_hres(v) <= q->max_hres) &&
- (q->min_vres == 0 || escp2_max_vres(v) >= q->min_vres) &&
- (q->min_hres == 0 || escp2_max_hres(v) >= q->min_hres))
- return 1;
+ unsigned max_x, max_y, min_x, min_y;
+ get_printer_resolution_bounds(v, &max_x, &max_y, &min_x, &min_y);
+ if ((q->max_vres == 0 || min_y <= q->max_vres) &&
+ (q->min_vres == 0 || max_y >= q->min_vres) &&
+ (q->max_hres == 0 || min_x <= q->max_hres) &&
+ (q->min_hres == 0 || max_x >= q->min_hres))
+ {
+ stp_dprintf(STP_DBG_ESCP2, v, "Quality %s OK: %d %d %d %d\n",
+ q->text, q->min_hres, q->min_vres, q->max_hres, q->max_vres);
+ return 1;
+ }
else
- return 0;
+ {
+ stp_dprintf(STP_DBG_ESCP2, v, "Quality %s not OK: %d %d %d %d\n",
+ q->text, q->min_hres, q->min_vres, q->max_hres, q->max_vres);
+ return 0;
+ }
}
static const res_t *
@@ -1466,7 +1546,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
const stp_papersize_t *pt = stp_get_papersize_by_index(i);
if (verify_papersize(v, pt))
stp_string_list_add_string(description->bounds.str,
- pt->name, pt->text);
+ pt->name, gettext(pt->text));
}
}
description->deflt.str =
@@ -1512,7 +1592,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
const quality_t *q = &(quals->qualities[i]);
if (verify_quality(v, q))
stp_string_list_add_string(description->bounds.str, q->name,
- _(q->text));
+ gettext(q->text));
if (strcmp(q->name, "Standard") == 0)
has_standard_quality = 1;
}
@@ -1533,7 +1613,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
{
if (verify_resolution(v, res[i]))
stp_string_list_add_string(description->bounds.str,
- res[i]->name, _(res[i]->text));
+ res[i]->name, gettext(res[i]->text));
i++;
}
}
@@ -1550,7 +1630,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
if (verify_inktype(v, inks->inknames[i]))
stp_string_list_add_string(description->bounds.str,
inks->inknames[i]->name,
- _(inks->inknames[i]->text));
+ gettext(inks->inknames[i]->text));
description->deflt.str = "None";
}
else
@@ -1568,7 +1648,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
{
stp_string_list_add_string(description->bounds.str,
inks->inklists[i]->name,
- _(inks->inklists[i]->text));
+ gettext(inks->inklists[i]->text));
if (strcmp(inks->inklists[i]->name, "None") == 0)
has_default_choice = 1;
}
@@ -1588,7 +1668,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < nmediatypes; i++)
stp_string_list_add_string(description->bounds.str,
p->papers[i].name,
- _(p->papers[i].text));
+ gettext(p->papers[i].text));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
}
@@ -1605,7 +1685,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < ninputslots; i++)
stp_string_list_add_string(description->bounds.str,
slots->slots[i].name,
- _(slots->slots[i].text));
+ gettext(slots->slots[i].text));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
}
@@ -1641,7 +1721,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < nprinter_weaves; i++)
stp_string_list_add_string(description->bounds.str,
printer_weaves->printer_weaves[i].name,
- _(printer_weaves->printer_weaves[i].text));
+ gettext(printer_weaves->printer_weaves[i].text));
}
else
description->is_active = 0;
@@ -1724,8 +1804,9 @@ escp2_parameters(const stp_vars_t *v, const char *name,
}
else if (strcmp(name, "GrayTransition") == 0)
set_gray_transition_parameter(v, description, 2);
- else if (strcmp(name, "LightGrayTransition") == 0)
- set_gray_transition_parameter(v, description, 2);
+ else if (strcmp(name, "DarkGrayTransition") == 0 ||
+ strcmp(name, "LightGrayTransition") == 0)
+ set_gray_transition_parameter(v, description, 3);
else if (strcmp(name, "Gray1Transition") == 0 ||
strcmp(name, "Gray2Transition") == 0 ||
strcmp(name, "Gray3Transition") == 0)
@@ -1769,7 +1850,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < channel_names->count; i++)
stp_string_list_add_string
(description->bounds.str,
- channel_names->names[i], channel_names->names[i]);
+ channel_names->names[i], gettext(channel_names->names[i]));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
}
@@ -2733,6 +2814,7 @@ setup_head_parameters(stp_vars_t *v)
pd->separation_rows = escp2_separation_rows(v);
pd->pseudo_separation_rows = escp2_pseudo_separation_rows(v);
pd->extra_720dpi_separation = escp2_extra_720dpi_separation(v);
+ pd->bidirectional_upper_limit = escp2_bidirectional_upper_limit(v);
if (pd->horizontal_passes == 0)
pd->horizontal_passes = 1;
@@ -2776,6 +2858,13 @@ setup_page(stp_vars_t *v)
safe and print 16 mm */
stp_default_media_size(v, &n, &(pd->page_true_height));
+ pd->page_extra_height = escp2_page_extra_height(v);
+ if (pd->page_extra_height > 0 &&
+ escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES) &&
+ (!(input_slot->is_cd) && stp_get_boolean_parameter(v, "FullBleed")))
+ pd->page_extra_height +=
+ escp2_nozzles(v) * escp2_nozzle_separation(v) * 72 /
+ escp2_base_separation(v);
internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right,
&pd->page_bottom, &pd->page_top);
/* Don't use full bleed mode if the paper itself has a margin */
@@ -2789,6 +2878,7 @@ setup_page(stp_vars_t *v)
int top_center = escp2_cd_y_offset(v) +
stp_get_dimension_parameter(v, "CDYAdjustment");
pd->page_true_height = pd->page_bottom - pd->page_top;
+ pd->page_extra_height = 0;
stp_set_left(v, stp_get_left(v) - pd->page_left);
stp_set_top(v, stp_get_top(v) - pd->page_top);
pd->page_right -= pd->page_left;
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 9ad648f..1fd76b3 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
/*
- * "$Id: print-escp2.h,v 1.103 2006/05/06 21:30:59 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.105 2006/07/22 20:28:14 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -457,6 +457,9 @@ typedef struct escp2_printer
short extra_720dpi_separation;
short horizontal_position_alignment; /* Horizontal alignment */
/* for good performance */
+ int bidirectional_upper_limit; /* Highest total resolution */
+ /* for bidirectional printing */
+ /* in auto mode */
/*****************************************************************************/
/* Paper size limits */
int max_paper_width; /* Maximum paper width, in points */
@@ -492,6 +495,8 @@ typedef struct escp2_printer
short cd_y_offset; /* Center of CD (vertical offset) */
short cd_page_width; /* Width of "page" when printing to CD */
short cd_page_height; /* Height of "page" when printing to CD */
+ /* Extra height for form factor command */
+ short page_extra_height; /* Extra height (lie to set form factor) */
/*****************************************************************************/
/* Parameters for escputil */
short alignment_passes;
@@ -658,6 +663,7 @@ typedef struct
int separation_rows; /* Row separation scaling */
int pseudo_separation_rows; /* Special row separation for some printers */
int extra_720dpi_separation; /* Special separation needed at 720 DPI */
+ int bidirectional_upper_limit; /* Max total resolution for auto-bidi */
/* weave parameters */
int horizontal_passes; /* Number of horizontal passes required
@@ -675,6 +681,7 @@ typedef struct
int page_width; /* Page width (points) */
int page_height; /* Page height (points) */
int page_true_height; /* Physical page height (points) */
+ int page_extra_height; /* Extra height for set_form_factor */
int cd_x_offset; /* CD X offset (micro units) */
int cd_y_offset; /* CD Y offset (micro units) */
int cd_outer_radius; /* CD radius (micro units) */
@@ -721,5 +728,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
#endif /* GUTENPRINT_INTERNAL_ESCP2_H */
/*
- * End of "$Id: print-escp2.h,v 1.103 2006/05/06 21:30:59 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.105 2006/07/22 20:28:14 rlk Exp $".
*/
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 0f6faa6..5028b37 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
/*
- * "$Id: print-lexmark.c,v 1.153 2006/05/12 00:56:09 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.154 2006/05/28 16:59:05 rlk Exp $"
*
* Print plug-in Lexmark driver for the GIMP.
*
@@ -1208,7 +1208,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name,
if (stp_string_list_count(description->bounds.str) == 0)
description->deflt.str = pt->name;
stp_string_list_add_string(description->bounds.str,
- pt->name, pt->text);
+ pt->name, gettext(pt->text));
}
}
}
@@ -1225,7 +1225,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name,
if (stp_string_list_count(description->bounds.str) == 0)
description->deflt.str = res->name;
stp_string_list_add_string(description->bounds.str,
- res->name, _(res->text));
+ res->name, gettext(res->text));
res++;
}
}
@@ -1236,7 +1236,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name,
for (i = 0; caps->ink_types[i].name != NULL; i++)
stp_string_list_add_string(description->bounds.str,
caps->ink_types[i].name,
- _(caps->ink_types[i].text));
+ gettext(caps->ink_types[i].text));
}
else if (strcmp(name, "MediaType") == 0)
{
@@ -1245,7 +1245,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < paper_type_count; i++)
stp_string_list_add_string(description->bounds.str,
lexmark_paper_list[i].name,
- _(lexmark_paper_list[i].text));
+ gettext(lexmark_paper_list[i].text));
}
else if (strcmp(name, "InputSlot") == 0)
{
@@ -1254,7 +1254,7 @@ lexmark_parameters(const stp_vars_t *v, const char *name,
for (i = 0; i < sizeof(media_sources) / sizeof(stp_param_string_t); i++)
stp_string_list_add_string(description->bounds.str,
media_sources[i].name,
- _(media_sources[i].name));
+ gettext(media_sources[i].name));
}
else if (strcmp(name, "InkChannels") == 0)
{
diff --git a/src/main/print-list.c b/src/main/print-list.c
index f3d0a4b..9483007 100644
--- a/src/main/print-list.c
+++ b/src/main/print-list.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-list.c,v 1.23 2005/06/30 02:11:49 rlk Exp $"
+ * "$Id: print-list.c,v 1.24 2006/07/07 21:31:02 rleigh Exp $"
*
* Gutenprint list functions. A doubly-linked list implementation,
* with callbacks for freeing, sorting, and retrieving nodes by name
@@ -234,7 +234,7 @@ stp_list_get_end(const stp_list_t *list)
return list->end;
}
-static stp_list_t *
+static inline stp_list_t *
deconst_list(const stp_list_t *list)
{
return (stp_list_t *) list;
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 24c6a2c..c5ad531 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-olympus.c,v 1.58 2006/04/17 02:06:19 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.59 2006/05/28 16:59:05 rlk Exp $"
*
* Print plug-in Olympus driver for the GIMP.
*
@@ -1483,7 +1483,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
text = (p->item[i].text ? p->item[i].text : pt->text);
stp_string_list_add_string(description->bounds.str,
- p->item[i].name, text);
+ p->item[i].name, gettext(text));
if (! default_specified && pt && pt->width > 0 && pt->height > 0)
{
description->deflt.str = p->item[i].name;
@@ -1514,7 +1514,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
{
sprintf(res_text, "%s DPI", r->item[i].name);
stp_string_list_add_string(description->bounds.str,
- r->item[i].name, _(res_text));
+ r->item[i].name, gettext(res_text));
}
if (r->n_items < 1)
description->is_active = 0;
@@ -1526,7 +1526,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
description->bounds.str = stp_string_list_create();
for (i = 0; i < caps->inks->n_items; i++)
stp_string_list_add_string(description->bounds.str,
- caps->inks->item[i].name, caps->inks->item[i].name);
+ caps->inks->item[i].name, gettext(caps->inks->item[i].name));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
if (caps->inks->n_items < 2)
@@ -1543,7 +1543,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
{
const laminate_t *l = &(llist->item[i]);
stp_string_list_add_string(description->bounds.str,
- l->name, l->text);
+ l->name, gettext(l->text));
}
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index 1feaacf..f1afc25 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-pcl.c,v 1.142 2006/05/12 00:53:18 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.144 2006/07/07 13:11:42 rlk Exp $"
*
* Print plug-in HP PCL driver for the GIMP.
*
@@ -1018,6 +1018,19 @@ static const pcl_cap_t pcl_model_capabilities[] =
emptylist,
laserjet_papersources,
},
+ /* Some laser printers don't have expanded A4 margins */
+ { 22,
+ 17 * 72 / 2, 14 * 72,
+ 1, 1, /* Min paper size */
+ PCL_RES_150_150 | PCL_RES_300_300,
+ {12, 12, 18, 18},
+ {12, 12, 18, 18}, /* Check/Fix */
+ PCL_COLOR_NONE,
+ PCL_PRINTER_LJ,
+ ljsmall_papersizes,
+ emptylist,
+ laserjet_papersources,
+ },
/* LaserJet III series */
{ 3,
17 * 72 / 2, 14 * 72,
@@ -1031,6 +1044,19 @@ static const pcl_cap_t pcl_model_capabilities[] =
emptylist,
laserjet_papersources,
},
+ /* Some laser printers don't have expanded A4 margins */
+ { 32,
+ 17 * 72 / 2, 14 * 72,
+ 1, 1, /* Min paper size */
+ PCL_RES_150_150 | PCL_RES_300_300,
+ {12, 12, 18, 18},
+ {12, 12, 18, 18}, /* Check/Fix */
+ PCL_COLOR_NONE,
+ PCL_PRINTER_LJ | PCL_PRINTER_TIFF | PCL_PRINTER_BLANKLINE,
+ ljsmall_papersizes,
+ emptylist,
+ laserjet_papersources,
+ },
/* LaserJet 4L */
{ 4,
17 * 72 / 2, 14 * 72,
@@ -1085,6 +1111,20 @@ static const pcl_cap_t pcl_model_capabilities[] =
emptylist,
laserjet_papersources,
},
+ /* Some laser printers don't have expanded A4 margins */
+ { 62,
+ 17 * 72 / 2, 14 * 72,
+ 1, 1, /* Min paper size */
+ PCL_RES_150_150 | PCL_RES_300_300 | PCL_RES_600_600,
+ {12, 12, 18, 18},
+ {12, 12, 18, 18}, /* Check/Fix */
+ PCL_COLOR_NONE,
+ PCL_PRINTER_LJ | PCL_PRINTER_NEW_ERG | PCL_PRINTER_TIFF | PCL_PRINTER_BLANKLINE |
+ PCL_PRINTER_DUPLEX,
+ ljsmall_papersizes,
+ emptylist,
+ laserjet_papersources,
+ },
/* LaserJet 5Si */
{ 7,
13 * 72, 19 * 72,
@@ -1336,7 +1376,7 @@ static const char * pcl_val_to_text(int code, /* I: Code */
for (i=0; i<num_options; i++) {
if (code == options[i].pcl_code) {
- string=options[i].pcl_text;
+ string=gettext(options[i].pcl_text);
break;
}
}
@@ -1578,7 +1618,7 @@ pcl_parameters(const stp_vars_t *v, const char *name,
const stp_papersize_t *pt = stp_get_papersize_by_index(i);
if (strlen(pt->name) > 0 && pcl_papersize_valid(pt, model))
stp_string_list_add_string(description->bounds.str,
- pt->name, pt->text);
+ pt->name, gettext(pt->text));
}
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
@@ -1650,9 +1690,9 @@ pcl_parameters(const stp_vars_t *v, const char *name,
{
description->deflt.str = ink_types[0].name;
stp_string_list_add_string(description->bounds.str,
- ink_types[0].name,_(ink_types[0].text));
+ ink_types[0].name,gettext(ink_types[0].text));
stp_string_list_add_string(description->bounds.str,
- ink_types[1].name,_(ink_types[1].text));
+ ink_types[1].name,gettext(ink_types[1].text));
}
else
description->is_active = 0;
@@ -1683,7 +1723,7 @@ pcl_parameters(const stp_vars_t *v, const char *name,
for (i=0; i < NUM_DUPLEX; i++)
{
stp_string_list_add_string(description->bounds.str,
- duplex_types[i].name,_(duplex_types[i].text));
+ duplex_types[i].name,gettext(duplex_types[i].text));
}
}
else
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index d85dd94..702d2d7 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-ps.c,v 1.84 2006/04/17 02:06:19 rlk Exp $"
+ * "$Id: print-ps.c,v 1.87 2006/06/04 18:06:34 rleigh Exp $"
*
* Print plug-in Adobe PostScript driver for the GIMP.
*
@@ -34,6 +34,7 @@
#include "gutenprint-internal.h"
#include <time.h>
#include <string.h>
+#include <math.h>
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
@@ -159,6 +160,8 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
stp_fill_parameter_settings(description, &(the_parameters[i]));
break;
}
+ if (strcmp(name, "PPDFile") == 0)
+ return;
if (strcmp(name, "PrintingMode") == 0)
{
@@ -183,7 +186,7 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
const stp_papersize_t *pt = stp_get_papersize_by_index(i);
if (strlen(pt->name) > 0)
stp_string_list_add_string
- (description->bounds.str, pt->name, pt->text);
+ (description->bounds.str, pt->name, gettext(pt->text));
}
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
@@ -230,9 +233,9 @@ static void
ps_parameters(const stp_vars_t *v, const char *name,
stp_parameter_t *description)
{
- setlocale(LC_ALL, "C");
+ char *locale = setlocale(LC_ALL, "C");
ps_parameters_internal(v, name, description);
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, locale);
}
/*
@@ -260,8 +263,8 @@ ps_media_size_internal(const stp_vars_t *v, /* I */
!= NULL)
{
sscanf(dimensions, "%f%f", &fwidth, &fheight);
- *width = fwidth;
- *height = fheight;
+ *width = (int) fwidth;
+ *height = (int) fheight;
stp_dprintf(STP_DBG_PS, v, "dimensions '%s' %f %f %d %d\n",
dimensions, fwidth, fheight, *width, *height);
}
@@ -272,9 +275,9 @@ ps_media_size_internal(const stp_vars_t *v, /* I */
static void
ps_media_size(const stp_vars_t *v, int *width, int *height)
{
- setlocale(LC_ALL, "C");
+ char *locale = setlocale(LC_ALL, "C");
ps_media_size_internal(v, width, height);
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, locale);
}
/*
@@ -304,13 +307,16 @@ ps_imageable_area_internal(const stp_vars_t *v, /* I */
"ImageableArea", pagesize, NULL))
!= NULL)
{
- stp_dprintf(STP_DBG_PS, v, "area = \'%s\'\n", area);
- if (sscanf(area, "%f%f%f%f", &fleft, &fbottom, &fright, &ftop) == 4)
+ int status = sscanf(area, "%f%f%f%f", &fleft, &fbottom, &fright, &ftop);
+ stp_dprintf(STP_DBG_PS, v,
+ "area = \'%s\' status = %d l %f r %f b %f t %f h %d w %d\n",
+ area, status, fleft, fright, fbottom, ftop, width, height);
+ if (status)
{
- *left = (int)fleft;
- *right = (int)fright;
- *bottom = height - (int)fbottom;
- *top = height - (int)ftop;
+ *left = (int) ceil((double) fleft);
+ *right = (int) floor((double) fright);
+ *bottom = (int) floor((double) height - fbottom);
+ *top = (int) ceil((double) height - ftop);
if (use_max_area)
{
if (*left > 0)
@@ -344,9 +350,9 @@ ps_imageable_area(const stp_vars_t *v, /* I */
int *bottom, /* O - Bottom position in points */
int *top) /* O - Top position in points */
{
- setlocale(LC_ALL, "C");
+ char *locale = setlocale(LC_ALL, "C");
ps_imageable_area_internal(v, 0, left, right, bottom, top);
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, locale);
}
static void
@@ -356,9 +362,9 @@ ps_maximum_imageable_area(const stp_vars_t *v, /* I */
int *bottom, /* O - Bottom position in points */
int *top) /* O - Top position in points */
{
- setlocale(LC_ALL, "C");
+ char *locale = setlocale(LC_ALL, "C");
ps_imageable_area_internal(v, 1, left, right, bottom, top);
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, locale);
}
static void
@@ -391,9 +397,9 @@ ps_describe_resolution_internal(const stp_vars_t *v, int *x, int *y)
static void
ps_describe_resolution(const stp_vars_t *v, int *x, int *y)
{
- setlocale(LC_ALL, "C");
+ char *locale = setlocale(LC_ALL, "C");
ps_describe_resolution_internal(v, x, y);
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, locale);
}
static const char *
@@ -454,6 +460,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
int image_height,
image_width;
stp_vars_t *nv = stp_vars_create_copy(v);
+ char *locale;
if (!resolution)
resolution = "";
if (!media_size)
@@ -638,11 +645,11 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
always be printed with a decimal point rather than the
locale-specific setting. */
- setlocale(LC_ALL, "C");
+ locale = setlocale(LC_ALL, "C");
stp_zprintf(v, "%.3f %.3f scale\n",
(double)out_width / ((double)image_width),
(double)out_height / ((double)image_height));
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, locale);
stp_channel_reset(nv);
stp_channel_add(nv, 0, 0, 1.0);
@@ -766,10 +773,9 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
static int
ps_print(const stp_vars_t *v, stp_image_t *image)
{
- int status;
- setlocale(LC_ALL, "C");
- status = ps_print_internal(v, image);
- setlocale(LC_ALL, "");
+ char *locale = setlocale(LC_ALL, "C");
+ int status = ps_print_internal(v, image);
+ setlocale(LC_ALL, locale);
return status;
}
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index 5c3d621..c2b1d27 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-vars.c,v 1.74 2005/10/26 01:28:35 rlk Exp $"
+ * "$Id: print-vars.c,v 1.75 2006/06/25 00:25:14 rlk Exp $"
*
* Print plug-in driver utility functions for the GIMP.
*
@@ -144,8 +144,14 @@ create_vars_list(void)
static void
copy_to_raw(stp_raw_t *raw, const void *data, size_t bytes)
{
- char *ndata = stp_malloc(bytes + 1);
- memcpy(ndata, data, bytes);
+ char *ndata = NULL;
+ if (data)
+ {
+ ndata = stp_malloc(bytes + 1);
+ memcpy(ndata, data, bytes);
+ }
+ else
+ bytes = 0;
ndata[bytes] = '\0';
raw->data = (void *) ndata;
raw->bytes = bytes;
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index e33e737..ba008b0 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-weave.c,v 1.64 2006/03/26 01:07:07 rlk Exp $"
+ * "$Id: print-weave.c,v 1.65 2006/07/07 22:34:43 rleigh Exp $"
*
* Softweave calculator for Gutenprint.
*
@@ -1164,7 +1164,7 @@ stp_initialize_weave(stp_vars_t *v,
}
static void
-weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw,
+weave_parameters_by_row(const stp_vars_t *v, stpi_softweave_t *sw,
int row, int vertical_subpass, stp_weave_t *w)
{
int jetsused;
@@ -1173,7 +1173,6 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw,
* Conceptually, this does not modify the softweave state. We cache
* the results, but this cache is considered hidden.
*/
- stpi_softweave_t *wsw = (stpi_softweave_t *) sw;
vertical_subpass /= sw->repeat_count;
if (sw->rcache == row && sw->vcache == vertical_subpass)
@@ -1182,8 +1181,8 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw,
w->pass = (w->pass * sw->repeat_count) + sub_repeat_count;
return;
}
- wsw->rcache = row;
- wsw->vcache = vertical_subpass;
+ sw->rcache = row;
+ sw->vcache = vertical_subpass;
w->row = row;
stpi_calculate_row_parameters(sw->weaveparm, row, vertical_subpass,
@@ -1193,7 +1192,7 @@ weave_parameters_by_row(const stp_vars_t *v, const stpi_softweave_t *sw,
w->physpassstart = w->logicalpassstart + sw->separation * w->missingstartrows;
w->physpassend = w->physpassstart + sw->separation * (jetsused - 1);
- memcpy(&(wsw->wcache), w, sizeof(stp_weave_t));
+ memcpy(&(sw->wcache), w, sizeof(stp_weave_t));
w->pass = (w->pass * sw->repeat_count) + sub_repeat_count;
stp_dprintf(STP_DBG_ROWS, v, "row %d, jet %d of pass %d "
"(pos %d, start %d, end %d, missing rows %d)\n",
@@ -1205,14 +1204,14 @@ void
stp_weave_parameters_by_row(const stp_vars_t *v, int row,
int vertical_subpass, stp_weave_t *w)
{
- const stpi_softweave_t *sw =
+ stpi_softweave_t *sw =
(stpi_softweave_t *) stp_get_component_data(v, "Weave");
weave_parameters_by_row(v, sw, row, vertical_subpass, w);
}
static stp_lineoff_t *
-stpi_get_lineoffsets(const stp_vars_t *v, const stpi_softweave_t *sw,
+stpi_get_lineoffsets(const stp_vars_t *v, stpi_softweave_t *sw,
int row, int subpass, int offset)
{
stp_weave_t w;
@@ -1221,7 +1220,7 @@ stpi_get_lineoffsets(const stp_vars_t *v, const stpi_softweave_t *sw,
}
static stp_lineactive_t *
-stpi_get_lineactive(const stp_vars_t *v, const stpi_softweave_t *sw,
+stpi_get_lineactive(const stp_vars_t *v, stpi_softweave_t *sw,
int row, int subpass, int offset)
{
stp_weave_t w;
@@ -1230,7 +1229,7 @@ stpi_get_lineactive(const stp_vars_t *v, const stpi_softweave_t *sw,
}
static stp_linecount_t *
-stpi_get_linecount(const stp_vars_t *v, const stpi_softweave_t *sw,
+stpi_get_linecount(const stp_vars_t *v, stpi_softweave_t *sw,
int row, int subpass, int offset)
{
stp_weave_t w;
@@ -1239,7 +1238,7 @@ stpi_get_linecount(const stp_vars_t *v, const stpi_softweave_t *sw,
}
static stp_linebufs_t *
-stpi_get_linebases(const stp_vars_t *v, const stpi_softweave_t *sw,
+stpi_get_linebases(const stp_vars_t *v, stpi_softweave_t *sw,
int row, int subpass, int offset)
{
stp_weave_t w;
@@ -1248,7 +1247,7 @@ stpi_get_linebases(const stp_vars_t *v, const stpi_softweave_t *sw,
}
static stp_linebounds_t *
-stpi_get_linebounds(const stp_vars_t *v, const stpi_softweave_t *sw,
+stpi_get_linebounds(const stp_vars_t *v, stpi_softweave_t *sw,
int row, int subpass, int offset)
{
stp_weave_t w;
@@ -1257,7 +1256,7 @@ stpi_get_linebounds(const stp_vars_t *v, const stpi_softweave_t *sw,
}
static stp_pass_t *
-stpi_get_pass_by_row(stp_vars_t *v, const stpi_softweave_t *sw,
+stpi_get_pass_by_row(stp_vars_t *v, stpi_softweave_t *sw,
int row, int subpass,int offset)
{
stp_weave_t w;
@@ -1306,7 +1305,7 @@ stp_get_pass_by_pass(const stp_vars_t *v, int pass)
}
static void
-check_linebases(stp_vars_t *v, const stpi_softweave_t *sw,
+check_linebases(stp_vars_t *v, stpi_softweave_t *sw,
int row, int cpass, int head_offset, int color)
{
stp_linebufs_t *bufs =
diff --git a/src/main/printers.xml b/src/main/printers.xml
index 81d197b..c9e444e 100644
--- a/src/main/printers.xml
+++ b/src/main/printers.xml
@@ -4,7 +4,7 @@
XML description of printers known to libgutenprint
This file was originally generated. It should be edited by hand.
- "$Id: printers.xml,v 1.144 2006/03/12 22:22:12 rlk Exp $"
+ "$Id: printers.xml,v 1.146 2006/07/07 13:11:42 rlk Exp $"
-->
<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -675,68 +675,68 @@
<printer name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
<printer name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
<printer name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="2" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="3" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
- <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="6" parameters="pcl_laser_params" />
+ <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+ <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
<printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
<printer name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
<printer name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
<printer name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
- <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
<printer name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
<printer name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
<printer name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
<printer name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
<printer name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
- <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
- <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
- <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+ <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
<printer name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
<printer name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
<printer name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+ <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+ <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+ <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
<printer name="Okidata OL400" driver="okidata-ol400" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
<printer name="Okidata OL400e" driver="okidata-ol400e" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
<printer name="Okidata OL400ex" driver="okidata-ol400ex" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
diff --git a/src/main/sequence.c b/src/main/sequence.c
index f51a6ed..ef69990 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
/*
- * "$Id: sequence.c,v 1.21 2005/06/30 02:11:49 rlk Exp $"
+ * "$Id: sequence.c,v 1.22 2006/07/07 21:31:02 rleigh Exp $"
*
* Sequence data type. This type is designed to be derived from by
* the curve and dither matrix types.
@@ -70,7 +70,7 @@ check_sequence(const stp_sequence_t *v)
}
}
-static stp_sequence_t *
+static inline stp_sequence_t *
deconst_sequence(const stp_sequence_t *sequence)
{
return (stp_sequence_t *) sequence;
diff --git a/src/testpattern/Makefile.am b/src/testpattern/Makefile.am
index 6db8e05..fa190ea 100644
--- a/src/testpattern/Makefile.am
+++ b/src/testpattern/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.24 2006/05/12 01:10:19 rlk Exp $
+## $Id: Makefile.am,v 1.25 2006/05/28 19:17:26 rlk Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,7 @@ TESTS = run-testpattern run-testpattern-1 run-testpattern-2
if BUILD_TESTPATTERN
bin_PROGRAMS = testpattern
noinst_PROGRAMS = printers printer_options
+noinst_SCRIPTS = run-testpattern-2
endif
AM_LFLAGS = -i
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index 698168d..c5833f9 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -20,6 +20,7 @@
#export STP_DATA_PATH = $(top_srcdir)/src/main
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -75,6 +76,7 @@ am_testpattern_OBJECTS = testpattern.$(OBJEXT) testpatterny.$(OBJEXT) \
testpatternl.$(OBJEXT)
testpattern_OBJECTS = $(am_testpattern_OBJECTS)
testpattern_DEPENDENCIES = $(am__DEPENDENCIES_1)
+SCRIPTS = $(noinst_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -127,6 +129,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
@@ -349,6 +353,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
TESTS = run-testpattern run-testpattern-1 run-testpattern-2
+@BUILD_TESTPATTERN_TRUE@noinst_SCRIPTS = run-testpattern-2
AM_LFLAGS = -i
AM_YFLAGS = -d
testpattern_SOURCES = testpattern.c testpatterny.y testpatternl.l testpattern.h
@@ -663,7 +668,7 @@ distdir: $(DISTFILES)
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c
index 9381be0..388e920 100644
--- a/src/testpattern/printer_options.c
+++ b/src/testpattern/printer_options.c
@@ -1,5 +1,5 @@
/*
- * "$Id: printer_options.c,v 1.1 2006/05/12 01:10:19 rlk Exp $"
+ * "$Id: printer_options.c,v 1.2 2006/05/28 16:59:05 rlk Exp $"
*
* Dump the per-printer options for Grant Taylor's *-omatic database
*
@@ -165,11 +165,11 @@ main(int argc, char **argv)
printf("$stp_float_values{'%s'}{'DEFVAL'}{'%s'} = %.3f;\n",
driver, desc.name, desc.deflt.dbl);
/* printf("$stp_float_values{'%s'}{'LONG_NAME'}{'%s'} = '%s';\n",
- driver, desc.name, _(desc.text)); */
+ driver, desc.name, gettext(desc.text)); */
printf("$stp_float_values{'%s'}{'CATEGORY'}{'%s'} = '%s';\n",
- driver, desc.name, _(desc.category));
+ driver, desc.name, gettext(desc.category));
printf("$stp_float_values{'%s'}{'HELP'}{'%s'} = q(%s);\n",
- driver, desc.name, (desc.help ? _(desc.help) : "''"));
+ driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
printf("$stp_float_values{'%s'}{'MANDATORY'}{'%s'} = q(%d);\n",
driver, desc.name, desc.is_mandatory);
}
@@ -186,11 +186,11 @@ main(int argc, char **argv)
printf("$stp_int_values{'%s'}{'DEFVAL'}{'%s'} = %d;\n",
driver, desc.name, desc.deflt.integer);
/* printf("$stp_int_values{'%s'}{'LONG_NAME'}{'%s'} = '%s';\n",
- driver, desc.name, _(desc.text)); */
+ driver, desc.name, gettext(desc.text)); */
printf("$stp_int_values{'%s'}{'CATEGORY'}{'%s'} = '%s';\n",
- driver, desc.name, _(desc.category));
+ driver, desc.name, gettext(desc.category));
printf("$stp_int_values{'%s'}{'HELP'}{'%s'} = q(%s);\n",
- driver, desc.name, (desc.help ? _(desc.help) : "''"));
+ driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
printf("$stp_int_values{'%s'}{'MANDATORY'}{'%s'} = q(%d);\n",
driver, desc.name, desc.is_mandatory);
}
@@ -207,11 +207,11 @@ main(int argc, char **argv)
printf("$stp_dimension_values{'%s'}{'DEFVAL'}{'%s'} = %d;\n",
driver, desc.name, desc.deflt.dimension);
/* printf("$stp_dimension_values{'%s'}{'LONG_NAME'}{'%s'} = '%s';\n",
- driver, desc.name, _(desc.text)); */
+ driver, desc.name, gettext(desc.text)); */
printf("$stp_dimension_values{'%s'}{'CATEGORY'}{'%s'} = '%s';\n",
- driver, desc.name, _(desc.category));
+ driver, desc.name, gettext(desc.category));
printf("$stp_dimension_values{'%s'}{'HELP'}{'%s'} = q(%s);\n",
- driver, desc.name, (desc.help ? _(desc.help) : "''"));
+ driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
printf("$stp_dimension_values{'%s'}{'MANDATORY'}{'%s'} = q(%d);\n",
driver, desc.name, desc.is_mandatory);
}
diff --git a/test/Makefile.in b/test/Makefile.in
index ddbb656..32fa54e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -126,6 +126,8 @@ BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
+BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@